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 |
|
s3lph
|
5912d1e624
|
Use a libmagic wrapper to guess Content-Type headers.
|
2018-07-20 00:32:51 +02:00 |
|
s3lph
|
96657c122b
|
Merge branch 'dbfacade-staging-merge' into 'master'
Added balance/stock to User/Product and changed the DatabaseFacade accordingly.
See merge request s3lph/matemat!18
|
2018-07-19 20:31:53 +00:00 |
|
s3lph
|
2a75151c2f
|
Merge branch 'dbfacade-staging-merge' into staging-unstable
|
2018-07-19 22:06:31 +02:00 |
|
s3lph
|
c4018156f5
|
Changed the change_user and change_product API to get rid of the update -> write -> undo on failure pattern.
|
2018-07-19 21:51:35 +02:00 |
|
s3lph
|
fcc64d1662
|
Implemented unit tests for get_user and get_product.
|
2018-07-19 21:33:19 +02:00 |
|
s3lph
|
105a10e91b
|
Merged extended database API into a branch derived from master. WIP; needs unit tests.
|
2018-07-17 22:03:08 +02:00 |
|
s3lph
|
e11205c36d
|
Merge branch 'deployment-to-master' into 'master'
Improved CI Pipeline and Dockerfiles
Closes #8
See merge request s3lph/matemat!17
|
2018-07-17 18:51:07 +00:00 |
|
s3lph
|
22dadcc19e
|
Merge branch 'deployment-to-master' into staging-unstable
|
2018-07-17 20:46:27 +02:00 |
|
s3lph
|
fbcde6acc0
|
Added CI pipeline and Docker deployment to documentation; CI: only build image for staging branches and retag the image with :latest-staging.
|
2018-07-17 20:30:40 +02:00 |
|
s3lph
|
87f65c84b0
|
Merged staging/deployment configuration (Dockerfiles and CI config) into a branch derived from master.
|
2018-07-16 22:36:51 +02:00 |
|
s3lph
|
f8a9ac4112
|
Merge branch 'staging-deployment-config' into staging-unstable
|
2018-07-16 19:57:27 +02:00 |
|
s3lph
|
d5a92287e0
|
Added partial config file for deployment image.
|
2018-07-16 19:53:26 +02:00 |
|
s3lph
|
bb3d9e62e6
|
Ported code to Python 3.7. TODO: Port CI pipeline and deployment images.
|
2018-07-16 19:47:54 +02:00 |
|
s3lph
|
3e289e4df8
|
Merge branch 'master' into staging-unstable
|
2018-07-15 00:57:33 +02:00 |
|
s3lph
|
f4685114b2
|
Merge branch 'mypy-type-fixes' into 'master'
Fixed some minor type annotation issues.
See merge request s3lph/matemat!16
|
2018-07-14 22:56:43 +00:00 |
|
s3lph
|
fe83b2017c
|
Fixed some minor type annotation issues.
|
2018-07-15 00:55:39 +02:00 |
|
s3lph
|
2169e50c23
|
Fixed staging branch regex in GitLab CI config.
|
2018-07-15 00:26:37 +02:00 |
|
s3lph
|
fbfa172e2b
|
Removed a dangling branch name from the CI config.
|
2018-07-15 00:25:22 +02:00 |
|