Commit Graph

1225 Commits

Author SHA1 Message Date
Aarni Halinen 8b1f668d38 Merge branch 'develop' into 'master'
Dependency bump, move volumes under static file server

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!17
2020-03-05 19:21:53 +00:00
Aarni Halinen 648feaa762 Ignore admin.py and translation.py files on test coverage 2020-03-05 21:12:24 +02:00
Aarni Halinen 6d4662a1cb Add Django volumes to hidden directory on static file server 2020-03-05 21:00:20 +02:00
Aarni Halinen 523adcd256 Remove Pipenv possibility, bump deps 2020-02-22 19:45:28 +02:00
Aarni Halinen 5f0ab2ddbf Default PG password for dev and local development 2020-02-22 15:06:49 +02:00
Leo Lahti 6e3b3bd52f Bumped psycopg2 to 2.8.4 2020-02-22 14:38:38 +02:00
Toni Lyttinen 027bf5e7bd Merge branch 'develop' into 'master'
Color updates to Ohlhalv

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!16
2020-02-02 14:42:40 +00:00
Toni Lyttinen 6dcbc1c652 Updated ohlhafv navbar color 2020-02-02 14:31:43 +00:00
Toni Lyttinen 80e00e2b05 Changed ohlhalv button hover color 2020-02-02 14:29:35 +00:00
Toni Lyttinen be22fea3f2 Merge branch 'develop' into 'master'
Updated ohlhafv challenge buttoncolor to match the page background

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!15
2020-02-02 14:26:23 +00:00
Toni Lyttinen 80298d174f Updated challenge buttoncolor to match the page background 2020-02-02 14:15:00 +00:00
Toni Lyttinen 5e434408b0 Merge branch 'develop' into 'master'
New Ohlhafv graphics

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!14
2020-02-02 14:00:17 +00:00
Aarni Halinen b790906b23 Fix year issue in contact tests 2020-02-02 15:31:16 +02:00
Toni Lyttinen e7164bb613 Update heevit.svg image to 2020 version 2020-02-02 13:29:15 +00:00
Toni Lyttinen a2a2b9830e Update background color to match the image 2020-02-02 13:28:41 +00:00
Aarni Halinen eb0bfdbd21 Move bad test fail one year forward 2020-02-02 15:26:29 +02:00
Toni Lyttinen 41762e920f Updated background color to match image 2020-02-02 13:10:41 +00:00
Toni Lyttinen d9116e51ca Updated background color to match image 2020-02-02 13:07:11 +00:00
Toni Lyttinen 3188a8e520 Replace heevit.svg 2020-02-02 13:01:42 +00:00
Toni Lyttinen a9c1d06ece Updated heevit.svg to 2020 version. 2020-02-02 12:59:23 +00:00
Aarni Halinen f390e1fb1f Merge branch 'develop' into 'master'
api.sika.sik.party

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!13
2019-12-18 18:39:27 +00:00
Aarni Halinen c32292c7d9 Allow api.sika.sik.party 2019-12-18 20:29:36 +02:00
Aarni Halinen f2ffcaa5a9 Parallelize CI a bit 2019-12-18 16:53:35 +02:00
Aarni Halinen 4e35a73a4b Merge branch 'develop' into 'master'
Update admin login url

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!12
2019-12-17 19:44:45 +00:00
Aarni Halinen d0216bb85c Update admin login url 2019-12-17 21:34:40 +02:00
Aarni Halinen 6955659acb Merge branch 'develop' into 'master'
Add filebrowser

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!11
2019-12-17 17:24:04 +00:00
Aarni Halinen 62263848f1 Add filebrowser and modify volume paths 2019-12-17 19:06:43 +02:00
Aarni Halinen dbc7811651 Merge branch 'develop' into 'master'
Update PG, Hackathon commits

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!10
2019-12-17 16:39:12 +00:00
Aarni Halinen 242199399b Use stop-first for PG update_config 2019-12-17 18:28:37 +02:00
Aarni Halinen 66d9ee0a75 Update backend postgres 2019-12-17 18:11:46 +02:00
Aarni Halinen c2222d4426 Fix lint 2019-11-22 18:09:53 +02:00
Aarni Halinen 368b28d241 Debug mode ALLOWED_HOSTS wildcard 2019-11-11 22:59:11 +02:00
Aarni Halinen c5df450a96 Minor import bug fix 2019-11-11 00:56:39 +02:00
Aarni Halinen c1e0a32a08 Merge branch 'feature/webapp-tests' into 'develop'
Feature/webapp tests

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!9
2019-11-10 22:55:40 +00:00
Aarni Halinen 373db50995 Minor fix to GET as admin 2019-11-11 00:47:22 +02:00
Aarni Halinen f422e31a42 Add some code to GET all objects as admin 2019-11-11 00:44:35 +02:00
Aarni Halinen f7cf54cab2 Fix webapp tests 2019-11-11 00:18:48 +02:00
Aarni Halinen d17e6710e6 Merge branch 'develop' into feature/webapp-tests 2019-11-10 21:38:07 +02:00
Aarni Halinen f64cec7d2e Fix Infernal Server Error on SignupForms 2019-11-10 21:34:10 +02:00
Aarni Halinen ff87767aab Merge branch 'develop' into feature/webapp-tests 2019-11-10 20:46:30 +02:00
Aarni Halinen 08ec9bb9cc Use json.loads for create and update of JSONField data 2019-11-10 20:46:16 +02:00
Aarni Halinen eb63c9fc1c Fix signup JSON form ID 2019-11-10 20:30:42 +02:00
Aarni Halinen eec157d7f3 Merge branch 'develop' into feature/webapp-tests 2019-11-10 20:28:06 +02:00
Jan Tuomi 1ce3c28e94 Use JSONField for signup and signupform models 2019-11-10 20:26:28 +02:00
Aarni Halinen 52a646fe04 Revert "Use JSONFields"
This reverts commit 5fba7d6249.
2019-11-10 20:25:21 +02:00
Aarni Halinen 8c4f6e886c New signup fixture 2019-11-10 20:13:27 +02:00
Aarni Halinen a9d6bf50d6 TemplateQuestion Tests 2019-11-10 20:00:13 +02:00
Aarni Halinen 8f0c9feecf Remove json dumps 2019-11-10 20:00:03 +02:00
Aarni Halinen 5fba7d6249 Use JSONFields 2019-11-10 19:24:18 +02:00
Aarni Halinen 3d755bca8c Remove translations from SignupFormSerializer 2019-11-10 19:19:08 +02:00