Commit Graph

1301 Commits

Author SHA1 Message Date
Toni Lyttinen a68fa9a6d6 Merge branch 'develop' into 'master'
Kaehmy fix Merge

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!27
2020-10-20 18:43:07 +00:00
Toni Lyttinen 22615da3b4 updated kaehmy dates and deadlines kaehmy.html 2020-10-20 17:25:41 +00:00
Toni Lyttinen d09cbf3b2c changed deadline for board application kaehmy_banner.png 2020-10-20 17:23:33 +00:00
Aarni Halinen 66fcfab4da Revert "Use Docker:18 for CI/CD"
This reverts commit a7d0f49190.
2020-10-15 00:54:36 +03:00
Aarni Halinen a7d0f49190 Use Docker:18 for CI/CD 2020-10-15 00:35:09 +03:00
Aarni Halinen 519571f84c Remove filebrowser deployment 2020-10-15 00:03:25 +03:00
Aarni Halinen 30847e8bc2 Serialize location and title locales 2020-10-08 18:38:27 +03:00
Aarni Halinen df69a64ffc Merge branch 'feature/signup-email' into 'develop'
Feature/signup email HTML

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!25
2020-10-08 15:03:33 +00:00
Toni Lyttinen 034e04a788 Merge branch 'develop' into 'master'
Merge kaehmy changes to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!26
2020-10-07 08:48:06 +00:00
Aarni Halinen 157f1c487c Get kahmyopas from static file server 2020-10-06 20:10:10 +03:00
Aarni Halinen 1e5a691d73 Send HTML email 2020-10-06 19:10:53 +03:00
Aarni Halinen 43fe25ba64 Get SignupForm email content from frontend 2020-10-06 18:33:41 +03:00
Toni Lyttinen 851269b13f fixed image src 2020-10-05 12:13:50 +00:00
Toni Lyttinen 0e5e18b035 Update kaehmy/static/kaehmy/img/kaehmy_banner.png, kaehmy/static/kaehmy/css/base.css, kaehmy/static/kaehmy/css/footer.css, kaehmy/static/kaehmy/css/header.css, kaehmy/static/kaehmy/css/nav.css, kaehmy/static/kaehmy/css/readme.md files 2020-10-05 12:12:02 +00:00
Toni Lyttinen f543e83e80 Update kaehmy/static/css/base.css, kaehmy/static/css/footer.css, kaehmy/static/css/header.css, kaehmy/static/css/nav.css, kaehmy/static/css/readme.md, kaehmy/static/img/kaehmy_banner.png files 2020-10-05 11:57:13 +00:00
Toni Lyttinen 0b72c20e32 more date fixing 2020-10-05 11:47:32 +00:00
Toni Lyttinen 04e6eb3ec2 changed dates on kaehmy.html 2020-10-05 11:22:54 +00:00
Toni Lyttinen 4e1efff7f2 changed kaehmy banner dates 2020-10-05 11:18:48 +00:00
Aarni Halinen d45f7195f5 Upgrade Pillow 2020-10-04 18:22:07 +03:00
Aarni Halinen dc6347a6eb Signup email and other model fields 2020-10-04 18:21:54 +03:00
Aarni Halinen 1304cffa2a Revert "SIK100 Seminar email hack"
This reverts commit 9b9406ab4b.
2020-09-22 17:58:33 +03:00
Aarni Halinen d416fda39e Merge branch 'develop' into 'master'
SIK100 Seminar email hack

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!23
2020-08-31 01:11:31 +00:00
Aarni Halinen 656b2d1d95 Add missing envs 2020-08-31 03:59:03 +03:00
Aarni Halinen 9b9406ab4b SIK100 Seminar email hack 2020-08-31 03:56:37 +03:00
Aarni Halinen e4fbb58026 Merge branch 'develop' into 'master'
API serializers for signups

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!22
2020-08-29 12:09:55 +00:00
Aarni Halinen 3630b360d7 Test proxy configs to get API return https-urls 2020-08-29 14:48:58 +03:00
Aarni Halinen c6a3445774 Merge branch 'improve/serialization' into 'develop'
Hide invisible signups from event serialization

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!21
2020-08-06 19:06:19 +00:00
Aarni Halinen 9b7e9a6d92 Bubblegum fix for event test 2020-08-06 22:04:16 +03:00
Aarni Halinen 3de975203e Minor improvements 2020-08-06 20:59:26 +03:00
Aarni Halinen 38669947cd Some serialization BS 2020-08-04 01:04:38 +03:00
Aarni Halinen e03b6e6606 Try ordering via @property field order_by 2020-08-03 12:03:07 +03:00
Aarni Halinen 8491842a04 Try ordering via @property field order_by 2020-08-03 11:57:24 +03:00
Aarni Halinen eb80250335 Try SerializerMethodField for ordering list_names 2020-08-03 11:20:13 +03:00
Aarni Halinen dec348b032 Try ordering signups on pk 2020-07-31 16:59:27 +03:00
Aarni Halinen 56dfd57698 Merge branch 'develop' into 'master'
Serialize SignupForm visible

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!20
2020-07-25 09:23:14 +00:00
Aarni Halinen 5071bd6172 Serialize SignupForm visible 2020-07-24 23:31:35 +03:00
Aarni Halinen 8632aa01da Merge branch 'develop' into 'master'
Signup modifications to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!19
2020-07-24 19:29:20 +00:00
Aarni Halinen f98971270a New email secrets for prod 2020-07-24 22:21:44 +03:00
Aarni Halinen e2d55ffce2 Name fields 2020-07-24 00:41:07 +03:00
Aarni Halinen 37cd2eda4c Update tests 2020-07-24 00:16:10 +03:00
Aarni Halinen aa0ae01227 Move SignupForm validation schema building to front end 2020-07-23 23:50:12 +03:00
Aarni Halinen 54ded7d3f9 Add quota for SignupForms 2020-07-22 20:57:26 +03:00
Aarni Halinen ef38d8be46 Support uploading of images from event creation 2020-07-22 19:11:39 +03:00
Aarni Halinen 673bbc09eb Signup edit URL 2020-07-17 15:50:04 +03:00
Aarni Halinen 9fa62e9a2f Some cleaning 2020-07-16 13:57:12 +03:00
Aarni Halinen 32e0704f53 Add boolean for text vs html email 2020-07-16 13:56:54 +03:00
Aarni Halinen 39ab86fe3e Get first signup email through 2020-07-16 13:27:18 +03:00
Aarni Halinen f9e7c4a904 Update sikdata-mount.ps 2020-07-16 07:58:19 +00:00
Aarni Halinen 0adca6bd2e Mailjet 2020-07-16 01:50:46 +03:00
Aarni Halinen 5c4e4c7f5a Allow usage of normal ENVs for Docker setups 2020-07-16 01:35:11 +03:00