diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ba703c..adfd23b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e1140b..a800353 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Matemat Changelog + +## Version 0.2.13 + +UX release + +### Changes + + +- Consistently sort users by name instead of user id + + + + ## Version 0.2.12 diff --git a/matemat/__init__.py b/matemat/__init__.py index 3d84215..4b94a86 100644 --- a/matemat/__init__.py +++ b/matemat/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.2.12' +__version__ = '0.2.13' diff --git a/matemat/db/facade.py b/matemat/db/facade.py index 3572ff9..ec4f3c7 100644 --- a/matemat/db/facade.py +++ b/matemat/db/facade.py @@ -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 }): diff --git a/package/debian/matemat/DEBIAN/control b/package/debian/matemat/DEBIAN/control index a988eeb..3cce219 100644 --- a/package/debian/matemat/DEBIAN/control +++ b/package/debian/matemat/DEBIAN/control @@ -1,5 +1,5 @@ Package: matemat -Version: 0.2.12 +Version: 0.2.13 Maintainer: s3lph Section: web Priority: optional diff --git a/templates/productlist.html b/templates/productlist.html index 104856d..8f1798e 100644 --- a/templates/productlist.html +++ b/templates/productlist.html @@ -36,7 +36,7 @@