1
0
Fork 0
forked from s3lph/matemat
Commit graph

170 commits

Author SHA1 Message Date
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
s3lph
9988ed4ef0 Added Docker and Git dependency to test image 2018-07-10 21:08:53 +02:00
s3lph
93319e874e Added a CI job that builds a docker image and pushes it to the project's registry. 2018-07-10 20:25:34 +02:00
s3lph
63a1ac291f Updated pagelet documentation to adopt the PageletResponse return value API. 2018-07-09 23:48:37 +02:00
s3lph
0481b5bf98 Always add Matemat version number to Jinja template. 2018-07-09 22:46:35 +02:00
s3lph
e618f06d11 Included version number in base template. 2018-07-09 22:41:58 +02:00
s3lph
6db093437b Merge branch 'jinja2-template' into DO-NOT-MERGE-horrible-webapp 2018-07-09 22:38:39 +02:00
s3lph
1b00c80133 Implemented a more explicit Pagelet return API using class instances to describe the action to take. 2018-07-09 20:50:02 +02:00
s3lph
e3c65776b5 A first, semi-sane integration of Jinja2 templates 2018-07-09 01:09:53 +02:00
s3lph
4d2d2d30c1 Added Jinja2 dependency 2018-07-09 00:11:40 +02:00
s3lph
50a9425fe2 Merge branch 'pagelet-return-api' into 'webserver-impl'
Pagelet return API

See merge request s3lph/matemat!8
2018-07-08 17:54:58 +00:00
s3lph
7c078f2c63 Merge branch 'webserver-impl' into pagelet-return-api 2018-07-08 15:18:17 +02:00
s3lph
a0d1520ecf Fixed a line-to-long style error 2018-07-08 15:13:58 +02:00
s3lph
079d9909c0 Some typing fixes that make mypy a litte happier 2018-07-08 15:10:22 +02:00
s3lph
14f339e630 Added unit test for redirection testing. 2018-07-07 19:24:00 +02:00
s3lph
a531447970 Added the changed pagelet API to the external documentation. 2018-07-07 19:10:41 +02:00
s3lph
f1ff14d29c More user-friendly return value in the pagelet API. 2018-07-07 18:58:23 +02:00
s3lph
0aa790dae8 Merge branch 'webserver-impl' into DO-NOT-MERGE-horrible-webapp 2018-07-07 15:40:59 +02:00
s3lph
528f7322ac Docstrings for the request parser tests. 2018-07-07 15:37:57 +02:00
s3lph
00bcae9874 Fixed behavior for missing Content-Type in multipart parts 2018-07-07 15:29:32 +02:00