jonny/matemat
1
0
Fork 0
forked from s3lph/matemat
Code Pull requests Activity
488 commits 2 branches 25 tags 1.1 MiB
Commit graph

488 commits

This branch
This branch
All branches
Author SHA1 Message Date
s3lph
6026f21a60 Fix: Session timeout lead to 500 error 2020-02-05 00:34:22 +01:00
s3lph
dddd9c75be Merge branch 'hotfix-session' into 'master' 
Fix: Sessions were shared between clients

See merge request s3lph/matemat!69
 2020-02-04 17:43:27 +00:00
s3lph
5cee6e1d22 Fix: Sessions were shared between clients 2020-02-04 18:39:28 +01:00
s3lph
0dc685ac81 Merge branch 'hotfix-config-fix' into 'master' 
Fix: Properly load config

See merge request s3lph/matemat!68
 2020-02-04 17:21:34 +00:00
s3lph
357afcd21b Fix: Properly load config 2020-02-04 18:19:57 +01:00
s3lph
9a09346a44 Merge branch 'hotfix-packages' into 'master' 
Hotfix: Properly parse config files

See merge request s3lph/matemat!67
 2020-02-04 17:05:17 +00:00
s3lph
9d959eecc3 Hotfix: Properly parse config files 2020-02-04 18:03:20 +01:00
s3lph
13bfa9f1c4 Merge branch 'hotfix-packages' into 'master' 
Some more hotfixes

See merge request s3lph/matemat!66
 2020-02-03 23:18:17 +00:00
s3lph
6cf47d62f1 Some more hotfixes 2020-02-04 00:17:07 +01:00
s3lph
a153af2541 Merge branch 'hotfix-archbuild' into 'master' 
Hotfix: Typo in Arch Linux dependency

See merge request s3lph/matemat!65
 2020-02-03 23:08:19 +00:00
s3lph
50815a2c74 Hotfix: Typo in Arch Linux dependency 2020-02-04 00:07:10 +01:00
s3lph
f1e8a058b9 Merge branch 'hotfix-ci-python37' into 'master' 
CI Hotfix

See merge request s3lph/matemat!64
 2020-02-03 23:00:06 +00:00
s3lph
ec7170ea42 CI Hotfix 2020-02-03 23:58:25 +01:00
s3lph
2c22bad8c5 Merge branch 'staging' into 'master' 
Release 0.2

See merge request s3lph/matemat!63
 2020-02-03 22:53:09 +00:00
s3lph
18a66a2f5a Prepare release 0.2 2020-02-03 23:47:33 +01:00
s3lph
10cf96d0fc Merge branch 'feature/bottle' into 'staging' 
bottle.py instead of custom web framework

See merge request s3lph/matemat!62
 2020-02-03 22:46:16 +00:00
s3lph
fe7a91b094 codestyle 2020-02-03 23:42:29 +01:00
s3lph
8700023349 Fix SIGINT termination issues 2020-02-03 23:39:51 +01:00
s3lph
18c720fdab Update docker images 2020-02-03 23:39:35 +01:00
s3lph
50b088b0ec Update debian and arch dependencies 2020-02-03 20:46:32 +01:00
s3lph
e5c3fad812 Further bottle porting 2020-02-03 20:44:58 +01:00
s3lph
8e8f159150 Migrate from own web framework to bottle.py 2019-11-22 03:58:54 +01:00
s3lph
6225063ea6 Merge branch 'staging' into 'master' 
Fixed: 500 Internal Server Error on password change with wrong original password.

See merge request s3lph/matemat!59
 2019-02-08 04:14:24 +00:00
s3lph
9b1d8eb61c Merge branch '29-internal-server-error-on-password-change' into 'staging' 
Resolve "Internal Server Error on password change with old password not matching."

See merge request s3lph/matemat!57
 2019-02-08 04:09:14 +00:00
s3lph
9006495aec Updated Matemat version to 0.1.1 2019-02-08 05:01:44 +01:00
s3lph
a620e219a4 Merge branch 'staging' into 'master' 
Fixed release notes for v0.1

See merge request s3lph/matemat!58
 2019-02-08 04:00:50 +00:00
s3lph
46fe1c776c Merge branch 'staging' into 29-internal-server-error-on-password-change 2019-02-08 04:58:11 +01:00
s3lph
79442e9206 Fixed release notes for v0.1 2019-02-08 04:57:03 +01:00
s3lph
d607495e4b Fixed: Error 500 on password change when old password didn't match. 2019-02-08 04:53:45 +01:00
s3lph
29de179802 Merge branch 'staging' into 'master' 
Added v1.0 changelog.

See merge request s3lph/matemat!56
 2019-02-08 03:43:23 +00:00
s3lph
229597f436 Added v1.0 changelog. 2019-02-08 04:39:41 +01:00
s3lph
7cb1bbe24a Merge branch 'staging' into 'master' 
Automated Deployment & Release Management

See merge request s3lph/matemat!55
 2019-02-08 03:37:38 +00:00
s3lph
8e1b91a8b8 Merge branch '27-deployment' into 'staging' 
Resolve "Deployment"

See merge request s3lph/matemat!50
 2019-02-08 03:32:01 +00:00
s3lph
f84b4da266 Removed test notes from changelog. 2019-02-08 04:29:53 +01:00
s3lph
6f2ba81842 Updated CI/CD documentation 2019-02-08 04:10:54 +01:00
s3lph
854a7bbcc2 CI: Disabled build_archlinux job on deployment feature branch. 2019-02-08 03:42:35 +01:00
s3lph
220407a0a3 Deployment documentation 2019-02-08 03:37:15 +01:00
s3lph
aa6cefcf37 CI: Archlinux: Replaced file, sudo, grep by base-devel 2019-02-08 03:13:20 +01:00
s3lph
dc45f9086e CI: Archlinux: Replaced file, sudo, grep by base-devel 2019-02-08 03:09:27 +01:00
s3lph
b48433561b CI: Archlinux: Added sudo dependency 2019-02-08 03:03:13 +01:00
s3lph
bd30119fe0 CI: Switched to a more recent archlinux base image 2019-02-08 02:59:11 +01:00
s3lph
9515c521b0 Merge branch 'master' into 27-deployment 2019-01-01 21:03:21 +01:00
s3lph
49856473b9 Merge branch 'staging' into 'master' 
FIxed: Allow receipts with no transactions.

See merge request s3lph/matemat!54
 2018-12-31 16:50:46 +00:00
s3lph
7f23fff033 Merge branch 'fix-receipt-empty-db' into 'staging' 
Added database support for empty receipts

See merge request s3lph/matemat!53
 2018-12-29 19:58:11 +00:00
s3lph
07a4d3131e Fixed a small bug in the SQL queries and the unit tests 2018-12-29 20:55:53 +01:00
s3lph
9a41d33ef7 Added database support for empty receipts (i.e. when a user didn't issue any transactions during a receipt period) 2018-12-29 20:36:59 +01:00
s3lph
1e6e9aabb2 Merge branch 'staging' into 'master' 
Fixed: Crash when creating a receipt with zero transactions

See merge request s3lph/matemat!52
 2018-12-23 22:00:30 +00:00
s3lph
ee87b4fb65 Merge branch 'hotfix-receipt-crash' into 'staging' 
Hotfix: Receipt crash

See merge request s3lph/matemat!51
 2018-12-23 21:53:36 +00:00
s3lph
ea70484d00 Added a test case for empty receipts. 2018-12-23 22:50:26 +01:00
s3lph
3d25540a1f Fixed a crash in receipt generation. 2018-12-23 22:43:19 +01:00