Merge branch 'staging' into 'master'

v0.2.13

See merge request s3lph/matemat!83
This commit is contained in:
s3lph 2022-07-20 19:52:23 +00:00
commit d3f2da88cc
6 changed files with 27 additions and 3 deletions

View file

@ -5,6 +5,7 @@ stages:
- test - test
- build - build
- deploy - deploy
- upload
@ -123,3 +124,12 @@ release:
- python package/release.py - python package/release.py
only: only:
- tags - tags
repo:
stage: upload
trigger: s3lph/custom-packages
variables:
MULTIPROJECT_TRIGGER_JOBNAME: matemat
only:
- tags

View file

@ -1,5 +1,18 @@
# Matemat Changelog # Matemat Changelog
<!-- BEGIN RELEASE v0.2.13 -->
## Version 0.2.13
UX release
### Changes
<!-- BEGIN CHANGES 0.2.13 -->
- Consistently sort users by name instead of user id
<!-- END CHANGES 0.2.13 -->
<!-- END RELEASE v0.2.13 -->
<!-- BEGIN RELEASE v0.2.12 --> <!-- BEGIN RELEASE v0.2.12 -->
## Version 0.2.12 ## Version 0.2.12

View file

@ -1,2 +1,2 @@
__version__ = '0.2.12' __version__ = '0.2.13'

View file

@ -87,6 +87,7 @@ class MatematDatabase(object):
SELECT user_id, username, email, is_admin, is_member, balance, receipt_pref SELECT user_id, username, email, is_admin, is_member, balance, receipt_pref
FROM users FROM users
WHERE touchkey IS NOT NULL OR NOT :must_have_touchkey WHERE touchkey IS NOT NULL OR NOT :must_have_touchkey
ORDER BY username COLLATE NOCASE ASC
''', { ''', {
'must_have_touchkey': with_touchkey 'must_have_touchkey': with_touchkey
}): }):

View file

@ -1,5 +1,5 @@
Package: matemat Package: matemat
Version: 0.2.12 Version: 0.2.13
Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol> Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Section: web Section: web
Priority: optional Priority: optional

View file

@ -36,7 +36,7 @@
<div id="transfer-userlist"> <div id="transfer-userlist">
<div id="scroll-up" onclick="scrollUserlist(-130);"></div> <div id="scroll-up" onclick="scrollUserlist(-130);"></div>
<ul id="transfer-userlist-list"> <ul id="transfer-userlist-list">
{% for user in ((users if user != authuser) | sort(attribute='name')) %} {% for user in (users if user != authuser) %}
<li onclick="set_transfer_user(this, {{ user.id }})">{{ user.name }}</li> <li onclick="set_transfer_user(this, {{ user.id }})">{{ user.name }}</li>
{% endfor %} {% endfor %}
</ul> </ul>