Commit Graph

1056 Commits

Author SHA1 Message Date
Aarni Halinen 41d6f17716 Merge branch 'develop' 2019-10-07 21:28:27 +03:00
Aarni Halinen e214144ec3 Add external secrets 2019-10-07 21:28:16 +03:00
Aarni Halinen 2649afdd4b Merge branch 'develop' 2019-10-07 21:19:28 +03:00
Aarni Halinen 0faf19e319 yml syntax fix 2019-10-07 21:19:05 +03:00
Aarni Halinen 8ee514326a Merge branch 'develop' 2019-10-07 21:10:43 +03:00
Aarni Halinen 10552c5f2a Try docker secrets 2019-10-07 21:10:19 +03:00
Aarni Halinen 48e34ece4f Merge branch 'develop' 2019-10-07 20:31:48 +03:00
Aarni Halinen 4181b246a1 Add path to .ENV file on prod server 2019-10-07 20:17:02 +03:00
Aarni Halinen c39979e253 Use different python image 2019-10-07 20:16:35 +03:00
Aarni Halinen 807c599b85 Typo fix 2019-10-07 20:03:07 +03:00
Aarni Halinen d2af34bf0c Merge branch 'develop' 2019-10-07 19:59:34 +03:00
Aarni Halinen 9e186c32ba Manual production deploy 2019-10-07 19:59:23 +03:00
Aarni Halinen ddf4ad7b8d Merge branch 'develop' 2019-10-07 19:57:32 +03:00
Aarni Halinen e3d0709b31 Add new Dockerfile for prod 2019-10-07 19:56:55 +03:00
Aarni Halinen 3169191a0d Merge branch 'develop' into 'master'
New Sika & Membership application

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!3
2019-10-07 16:04:32 +00:00
Aarni Halinen bd8fc6b404 New Sika Docker swarm deploy 2019-10-07 18:50:00 +03:00
Antti Mäki 8500ed8fbd Update header.css 2019-10-06 22:18:21 +00:00
Aarni Halinen cb86c9a2ae Fix Kaehmy PresetRole rendering by removing wrap_label from checkbox_option.html 2019-10-06 18:32:17 +03:00
Aarni Halinen bb0f4244c7 Update django-bootstrap3 2019-10-06 18:31:18 +03:00
Aarni Halinen cd2fe4e8f2 Update kaehmy dates 2019-10-06 15:34:35 +03:00
Antti Mäki bf3f1f783c Replace kaehmy_banner.png 2019-10-06 11:03:09 +00:00
Antti Mäki 37f509ff76 Replace kaehmy_banner.png 2019-10-06 11:02:01 +00:00
Aarni Halinen 6c77fe4da6 Update autocomplete-light in requirements 2019-09-16 19:59:34 +03:00
Aarni Halinen 5dc7442d03 Update Python version and Django-autocomplete-light 2019-09-16 19:57:47 +03:00
Aarni Halinen 9f664737b6 Add Member application emails 2019-09-16 19:44:14 +03:00
Aarni Halinen 1c3b4367a2 Fix POST permissions for submit application 2019-09-16 17:55:14 +03:00
Leo Kivikunnas 9a9757c914 Moved expenses claim development to its own feature branch 2019-06-03 19:52:12 +03:00
Leo Kivikunnas 2bf19d357e Fixed IBAN validation and amount field in exenses claim and added some tests 2019-06-03 19:35:08 +03:00
Aarni Halinen 7e31f72301 Update docker image to new registry 2019-05-27 23:40:27 +03:00
Aarni Halinen 68bb003411 Fix .md file style warnings 2019-05-27 23:38:54 +03:00
Antti Mäki 7133f36e5d cd: web2.0: No such file or directory 2019-05-27 18:01:39 +00:00
Leo Kivikunnas c9962c4d8e Fixed style errors 2019-05-27 20:46:56 +03:00
Leo Kivikunnas 5832bd1765 Added venv got .eslintignore 2019-05-27 20:35:45 +03:00
Leo Kivikunnas 4046d2c753 Started work on expenses claim 2019-05-27 20:32:18 +03:00
Aarni Halinen 93298618ae Add docker login to deploy dev 2019-05-27 17:48:48 +03:00
Aarni Halinen 709a637ae2 Update repo url 2019-05-23 19:07:33 +03:00
Aarni Halinen a88bb30b62 Revert "Use same registry as frontend"
This reverts commit 38527207ac.
2019-05-23 19:03:57 +03:00
Aarni Halinen 38527207ac Use same registry as frontend 2019-05-23 15:40:39 +00:00
Aarni Halinen 6f90fcc016 Fix docker login on publish 2019-05-23 05:09:09 +00:00
Aarni Halinen 1e633ded31 Use gitlab-deploy-token
https://docs.gitlab.com/ee/user/project/deploy_tokens/
2019-05-22 03:51:15 +00:00
Aarni Halinen 4b3b8be4e4 Update publish in gitlab-ci.yml 2019-05-22 03:03:26 +00:00
Aarni Halinen effd58a424 Remove ilmotunkki 2019-04-02 15:16:23 +03:00
Aarni Halinen 850587006c Merge branch 'feature-infoscreen-lunch' into 'develop'
Feature infoscreen lunch

See merge request vtmk/web2.0!136
2019-03-26 17:39:19 +02:00
Aarni Halinen 423b574cca Add Today's lunch infoscreen 2019-03-26 17:33:09 +02:00
Aarni Halinen 7bb4a6cfc1 Fix webapp tests 2019-03-26 17:10:25 +02:00
Aarni Halinen 94f392ab87 Set pipenv and pyenv support 2019-03-26 15:44:50 +02:00
Aarni Halinen ccef40e63f Fix pycodestyle on webapp 2019-03-26 14:41:11 +02:00
Aarni Halinen 1c51b666ab Clean old infoscreen code and statics 2019-03-26 14:39:51 +02:00
Jan Tuomi b5462d5757 Turn questions field into a text field 2019-03-13 16:45:18 +02:00
Jan Tuomi 587632d7a3 Rename signup form fields and add title 2019-03-13 15:54:23 +02:00