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

389 commits

This branch
This branch
All branches
Author SHA1 Message Date
s3lph
f423aa579a Merge branch 'master' into staging-unstable 2018-07-14 23:09:07 +02:00
s3lph
8da1746d0c Merge branch '11-static-cache' into 'master' 
Resolve "Caching of Static Resources"

Closes #11

See merge request s3lph/matemat!13
 2018-07-14 21:08:26 +00:00
s3lph
96eaa2c4c0 Unit tests for 304 Not Modified testing. 2018-07-14 23:05:50 +02:00
s3lph
a9fc6f451b Cleaner datetime API usage. 2018-07-14 22:55:14 +02:00
s3lph
582bef44fd Touchkey now works on mobile browsers. 2018-07-14 22:48:27 +02:00
s3lph
87b66719e3 Implemented (probably quite shaky) static content cache headers. 2018-07-14 19:00:37 +02:00
s3lph
45be1930a4 Merge branch 'master' into staging-unstable 2018-07-14 13:20:53 +02:00
s3lph
5f2464b023 Merge branch '6-unified-logging' into 'master' 
Resolve "Unified Logging"

Closes #6

See merge request s3lph/matemat!12
 2018-07-14 11:18:37 +00:00
s3lph
4626f22339 config documentation 2018-07-14 13:14:53 +02:00
s3lph
8f82420d7f Logging config unit tests. 2018-07-14 12:55:09 +02:00
s3lph
a4967b1338 Slightly improved logging config. 2018-07-14 12:16:46 +02:00
s3lph
3382d23d85 Basic logging implementation; still undocumented. 2018-07-14 00:15:19 +02:00
s3lph
b2a88c5814 Renamed DO-NOT-MERGE-horrible-webapp branch to staging-unstable. 2018-07-13 22:15:45 +02:00
s3lph
fab4303d5b Merge branch 'master' into DO-NOT-MERGE-horrible-webapp 2018-07-13 22:10:11 +02:00
s3lph
b12535bc93 Merge branch '3-constant-time-password-verification' into 'master' 
Resolve "Password verification apparently vulnerable to timing attacks"

Closes #3

See merge request s3lph/matemat!11
 2018-07-13 20:08:11 +00:00
s3lph
55354deb21 Merge branch '7-configuration-file' into 'master' 
Configuration File Support

Closes #7

See merge request s3lph/matemat!10
 2018-07-13 20:05:12 +00:00
s3lph
9b67d1d1ff Merge branch '7-configuration-file' into DO-NOT-MERGE-horrible-webapp 2018-07-13 20:58:37 +02:00
s3lph
48ad9bc7df Fixed #3 Password verification apparently vulnerable to timing attacks. 2018-07-13 20:04:42 +02:00
s3lph
8fab13e13a Added support for multiple config files 2018-07-13 16:02:30 +02:00
s3lph
95c81608c3 Fixed a second minor issue in the wiki 2018-07-13 01:49:24 +02:00
s3lph
150588e6a9 Fixed a minor issue in the wiki 2018-07-13 01:47:15 +02:00
s3lph
eff8135acf Added configuration file documentation to wiki 2018-07-13 01:43:21 +02:00
s3lph
758a2eb018 Fixed: Expand ~ in config file parsing. 2018-07-13 01:22:17 +02:00
s3lph
23e6662ca8 Fixed previous unit tests and implemented tests for config parsing. 2018-07-13 00:15:08 +02:00
s3lph
2dd57dcfd6 Reworked and cleaned up config file integration. 2018-07-13 00:14:48 +02:00
s3lph
a52f09fc58 First, horrible config file support. 2018-07-11 22:06:06 +02:00
s3lph
9dde59fa71 Merge branch 'master' into DO-NOT-MERGE-horrible-webapp 2018-07-11 18:50:48 +02:00
s3lph
d60331daf7 Merge branch 'ci-deploy-staging' into DO-NOT-MERGE-horrible-webapp 2018-07-11 18:48:39 +02:00
s3lph
2347908381 Merge branch 'webserver-impl' into 'master' 
Web Server Implementation

See merge request s3lph/matemat!7
 2018-07-11 16:45:37 +00:00
s3lph
f860ae3b58 Fixed: Wrong argument name check when adding a new product. 2018-07-11 18:24:23 +02:00
s3lph
1ab69f1307 Fixed a wrong path missed earlier. 2018-07-11 18:23:34 +02:00
s3lph
355900e497 Disabled host key checking in the deployment CI job. 2018-07-11 17:55:48 +02:00
s3lph
66dd02fcdd Limited "staging" stage to only run on ci-deploy-staging. 2018-07-11 17:37:48 +02:00
s3lph
1f9860a707 Install a SSH client in the CI Docker image. 2018-07-11 17:34:59 +02:00
s3lph
0f0eb0ac3b Fixed syntax error in Gitlab CI config. 2018-07-11 17:20:24 +02:00
s3lph
69e08a70be Added a staging deployment CI job. 2018-07-11 17:17:00 +02:00
s3lph
68a228e95f Fixed user-generated static resources paths. 2018-07-11 16:57:38 +02:00
s3lph
8da58950ad Deployment image privileged once more... 2018-07-11 16:46:05 +02:00
s3lph
3a8497325f Moved database and user generated content to /var/matemat 2018-07-11 16:06:36 +02:00
s3lph
a6e7c244e4 Removed link to gitlab repo from Matemat footer, as people constantly clicked that in the touchscreen kiosk and could not get back. 2018-07-11 15:40:14 +02:00
s3lph
4ba0165e7c Added some barebones CSS to display the user- and product-list in a somewhat acceptable way. 2018-07-11 15:32:07 +02:00
s3lph
cf892211be Fixed #8: Touchkey did not work in Firefox. Apparently MouseEvent.offset{X,Y} are experimental features that don't seem to properly there. 2018-07-11 15:03:21 +02:00
s3lph
c3a7f3cf16 Fixed: Check if all required arguments are set in change requests from the admin panel. Also removed the requirement to enter the current password in order to change the touchkey. 2018-07-11 12:30:27 +02:00
s3lph
c74a0d734e Merge branch 'ci-build-image' into DO-NOT-MERGE-horrible-webapp 2018-07-11 12:21:48 +02:00
s3lph
873d08e86a Fixed docker image tag in CI config. 2018-07-10 22:33:44 +02:00
s3lph
4b759d724b Fixed docker push command in CI config. 2018-07-10 22:25:56 +02:00
s3lph
824694c811 Fixed typo in Gitlab CI config. 2018-07-10 22:18:57 +02:00
s3lph
bc19893d90 Made unit tests unprivileged again (using sudo) 2018-07-10 22:12:49 +02:00
s3lph
652520dc85 Merge branch 'jinja2-template' into 'webserver-impl' 
Jinja2 Template support, more explicit pagelet return API

See merge request s3lph/matemat!9
 2018-07-10 19:53:23 +00:00
s3lph
4292cf8696 Run tests as root inside the container. 2018-07-10 21:51:42 +02:00