Merge branch 'staging' into 'master'
v0.2.13 See merge request s3lph/matemat!83
This commit is contained in:
commit
d3f2da88cc
6 changed files with 27 additions and 3 deletions
|
@ -5,6 +5,7 @@ stages:
|
|||
- test
|
||||
- build
|
||||
- deploy
|
||||
- upload
|
||||
|
||||
|
||||
|
||||
|
@ -123,3 +124,12 @@ release:
|
|||
- python package/release.py
|
||||
only:
|
||||
- tags
|
||||
|
||||
|
||||
repo:
|
||||
stage: upload
|
||||
trigger: s3lph/custom-packages
|
||||
variables:
|
||||
MULTIPROJECT_TRIGGER_JOBNAME: matemat
|
||||
only:
|
||||
- tags
|
||||
|
|
13
CHANGELOG.md
13
CHANGELOG.md
|
@ -1,5 +1,18 @@
|
|||
# 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 -->
|
||||
## Version 0.2.12
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
|
||||
__version__ = '0.2.12'
|
||||
__version__ = '0.2.13'
|
||||
|
|
|
@ -87,6 +87,7 @@ class MatematDatabase(object):
|
|||
SELECT user_id, username, email, is_admin, is_member, balance, receipt_pref
|
||||
FROM users
|
||||
WHERE touchkey IS NOT NULL OR NOT :must_have_touchkey
|
||||
ORDER BY username COLLATE NOCASE ASC
|
||||
''', {
|
||||
'must_have_touchkey': with_touchkey
|
||||
}):
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: matemat
|
||||
Version: 0.2.12
|
||||
Version: 0.2.13
|
||||
Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
|
||||
Section: web
|
||||
Priority: optional
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<div id="transfer-userlist">
|
||||
<div id="scroll-up" onclick="scrollUserlist(-130);">▲</div>
|
||||
<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>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
Loading…
Reference in a new issue