weva/matemat
1
0
Fork 0
forked from s3lph/matemat
Code Pull requests Activity
363 commits 2 branches 30 tags 1.2 MiB
Commit graph

363 commits

This branch
This branch
All branches
Author SHA1 Message Date
s3lph
36176610c0 Merge branch '22-configurable-static-headers' into 'staging' 
Resolve "Configurable static headers"

See merge request s3lph/matemat!29
 2018-08-03 17:02:05 +00:00
s3lph
afd5004b09 Added documentation for statically configured headers 2018-08-03 18:59:58 +02:00
s3lph
30be649ae2 Implemented configurable static response headers. 2018-08-03 18:42:30 +02:00
s3lph
39342d5780 Merge branch 'staging' into 'master' 
Python 3.7

See merge request s3lph/matemat!27
 2018-08-03 15:53:26 +00:00
s3lph
5b771312d1 Updated CI doc to Python 3.7 2018-08-02 23:10:27 +02:00
s3lph
0daf37d94a Merge branch 'python-3.7' into 'staging' 
Python 3.7

See merge request s3lph/matemat!26
 2018-08-02 20:27:38 +00:00
s3lph
08dd9ce3ff Merge branch 'staging' into python-3.7 2018-08-02 22:23:05 +02:00
s3lph
576a25c975 Merge branch 'staging' into 'master' 
CI: Build a latest-stable tagged image on master

See merge request s3lph/matemat!24
 2018-08-02 20:17:49 +00:00
s3lph
c933ffd1c7 GitLab CI: Use CI variables instead of git ref-parse. 2018-08-02 22:08:47 +02:00
s3lph
7fc44bab2b GitLab CI: Fixed a typo. 2018-08-02 21:59:15 +02:00
s3lph
f8871a73e2 GitLab CI: Build an image tagged latest-stable for master. 2018-08-02 21:55:22 +02:00
s3lph
5537f2e1f3 GitLab CI: Fixed coverage invocation. 2018-08-02 21:39:05 +02:00
s3lph
51c804abf3 Added missing python-coverage to testing docker image. 2018-08-02 21:28:00 +02:00
s3lph
9f5c556417 Updated GitLab CI to use the latest docker image. 2018-08-02 20:44:17 +02:00
s3lph
97d175d62a Upgraded Dockerfiles to work with Python 3.7. With some weird stuff in the unittest dockerfile. 2018-08-02 20:37:54 +02:00
s3lph
207f4f1531 Merge branch 'staging' into python-3.7 2018-08-02 17:34:39 +02:00
s3lph
97a272c8e5 Merge branch 'staging-unstable' into 'master' 
Basic, but fully functional implementation

See merge request s3lph/matemat!23
 2018-08-02 15:23:29 +00:00
s3lph
1dd1640cbe Updated CI pipeline config to only deploy to staging on the branch "staging". 2018-08-02 17:21:22 +02:00
s3lph
3bca08e7ff Merge branch 'master' into staging-unstable 2018-08-02 17:19:26 +02:00
s3lph
69758ed2b2 Merge branch '21-documentation-and-tests-for-staging-unstable' into 'staging-unstable' 
Resolve "Documentation and Tests for staging-unstable"

See merge request s3lph/matemat!22
 2018-07-27 23:52:27 +00:00
s3lph
a9061f877b Added matemat pagelet description 2018-07-27 20:56:16 +02:00
s3lph
8aaf46e565 Added external touchkey documentation 2018-07-24 13:16:01 +02:00
s3lph
df013ea584 Snapping sensitivity now independent of size. 2018-07-24 00:38:37 +02:00
s3lph
61649657b0 Touchkey documentation & cleanup. 2018-07-23 21:07:53 +02:00
s3lph
be09ea1ee7 Wrote code documentation for the pagelets of the current implementation, and for some of the jinja2 templates 2018-07-23 00:19:41 +02:00
s3lph
c20029fb36 Moved primitives package to db. 2018-07-22 15:30:59 +02:00
s3lph
ddc3e17846 Merge branch '15-record-each-sale-individually' into 'staging-unstable' 
Resolve "Record each sale individually"

See merge request s3lph/matemat!21
 2018-07-21 22:44:10 +00:00
s3lph
bf4a2f4c97 added db schema documentation 2018-07-22 00:22:49 +02:00
s3lph
ca3c3e755c One more trailing whitespace. 2018-07-21 21:51:02 +02:00
s3lph
1c733c6203 Fixed another codestyle error. 2018-07-21 21:49:02 +02:00
s3lph
9afd86d5ab Fixed code style in db schema definitions. 2018-07-21 21:46:46 +02:00
s3lph
ce0a01cb7c Fixed change_user and change_product unit tests. 2018-07-21 21:45:05 +02:00
s3lph
bead299ccd Migration to a new database schema (version 2), where each transaction (purchase, deposit, or admin modification) is recorded individually. 2018-07-21 21:39:42 +02:00
s3lph
07fa842b6b Merge branch 'staging-currency-format' into 'staging-unstable' 
Currency formatting (#16)

See merge request s3lph/matemat!20
 2018-07-20 13:39:41 +00:00
s3lph
b1a56f59fc Moved currency formatting/parsing into generic util package 2018-07-20 15:30:58 +02:00
s3lph
a4930d268d Added code comments to parse_chf. 2018-07-20 15:25:06 +02:00
s3lph
862a0e6fa8 Implemented unit tests for currency formatting and parsing. 2018-07-20 15:20:33 +02:00
s3lph
103e06cf12 Implemented currency formatting and parsing. 2018-07-20 14:58:22 +02:00
s3lph
0ab7d48622 Enabled jinja2 escaping by default. 2018-07-20 13:57:23 +02:00
s3lph
7f4dc078ec Merge branch '18-libmagic-mime-type-detection' into 'master' 
Resolve "Use a libmagic wrapper for MIME type detection"

Closes #18

See merge request s3lph/matemat!19
 2018-07-20 11:39:31 +00:00
s3lph
63aef74e10 Merge branch '18-libmagic-mime-type-detection' into staging-unstable 2018-07-20 13:04:57 +02:00
s3lph
8b0e871dc7 Only use libmagic for static resources if extension-based guessing fails. 2018-07-20 13:01:33 +02:00
s3lph
17ffea037b Merge branch '18-libmagic-mime-type-detection' into staging-unstable 2018-07-20 11:49:25 +02:00
s3lph
fd7ff59137 Wrapped command for running matemat in the staging container in a shell script 2018-07-20 11:47:41 +02:00
s3lph
994138bb30 Merge branch '18-libmagic-mime-type-detection' into staging-unstable 2018-07-20 11:10:33 +02:00
s3lph
eb4504a7ea Added missing libmagic dependency to alpine-based image. 2018-07-20 11:09:43 +02:00
s3lph
b6b07fdac5 Merge branch '18-libmagic-mime-type-detection' into staging-unstable 2018-07-20 10:59:39 +02:00
s3lph
e6d5aef2b2 Removed libmagic dependency from staging Dockerfile; already present in the python:3.6-alpine base image. 2018-07-20 00:57:30 +02:00
s3lph
8598daf3b0 Catch potential file-magic exception. 2018-07-20 00:49:29 +02:00
s3lph
e2f2ab7727 Added libmagic to testing and staging Dockerfiles. 2018-07-20 00:45:15 +02:00