Commit Graph

1088 Commits

Author SHA1 Message Date
Aarni Halinen 889ad4f980 Merge branch 'develop' into 'master'
Ohlhafv and dependency fixes

Closes #117

See merge request vtmk/web2.0!132
2019-01-28 16:01:56 +02:00
Jan Tuomi a5bca8eab1 Add JWT verify endpoint 2019-01-17 15:48:49 +02:00
Aarni Halinen 2dfb53bd5e Use node:alpine 2019-01-15 20:04:21 +02:00
jaine 474df33a99 Fix borders in ohlhafv form 2019-01-15 16:42:08 +02:00
Aarni Halinen a2906966ba Use node latest on CI 2019-01-15 16:06:04 +02:00
Aarni Halinen a81096fa13 Update pyexcel to most recent version
Updating openpyxl or pyexcel-xlsx results error in tablib dependency
2019-01-15 16:02:55 +02:00
Aarni Halinen b56ff6c5cd Rollback pyexcel dependencies 2019-01-15 15:49:25 +02:00
Jan Tuomi 168de8088b Update Django to 2.1.5 and setup JWT auth 2019-01-15 15:41:40 +02:00
Aarni Halinen e7862df57c Use Python 3.5 image consistently 2019-01-15 15:25:40 +02:00
Jan Tuomi ec829a5683 Update .gitignore and requirements.txt 2019-01-15 14:00:20 +02:00
jaine bb3476a8ad Updated ohlhafv page css and img 2019-01-14 19:55:04 +02:00
jaine bab5c88061 Add help in error case in mac installation instruction 2019-01-14 19:15:02 +02:00
Aarni Halinen 7431aadfba Merge branch 'feature-API-filtering' into 'develop'
Feature api filtering

See merge request vtmk/web2.0!131
2018-11-18 19:05:14 +02:00
Aarni Halinen 1ecf3c368b Add authentication for post test 2018-11-18 18:58:12 +02:00
Aarni Halinen d3e6013840 Fix API test by getting results from json 2018-11-18 18:12:41 +02:00
Aarni Halinen e1220d17bb Add filtering to REST API 2018-11-18 17:56:32 +02:00
Aarni Halinen 55fdf8f60d Add filtering for Event and Signup ViewSets 2018-11-18 17:54:11 +02:00
Aarni Halinen 65aac3daf1 Add LimitOffsetPagination 2018-11-18 17:54:11 +02:00
Joel Lavikainen 1f8e9e582a Make tag tests more generic 2018-11-18 17:52:34 +02:00
Aarni Halinen 97e6ce3d8d Fix webapp migrations 2018-11-18 13:46:31 +02:00
Aarni Halinen 316ab679f8 Remove webapp migration 0048 2018-11-18 13:33:30 +02:00
Aarni Halinen bf5620c3b6 Revert "Remove PK slug from ancient migration"
This reverts commit 90f430c95c.
2018-11-18 13:31:48 +02:00
Joel Lavikainen 642aa9847f Revert model change 2018-11-18 04:58:59 +02:00
Aarni Halinen 90f430c95c Remove PK slug from ancient migration 2018-11-18 04:50:34 +02:00
Joel Lavikainen bf4c5bf3d9 Fix feed testcase 2018-11-18 04:43:49 +02:00
Joel Lavikainen b7beb72409 Fix linting errors 2018-11-18 04:39:31 +02:00
Joel Lavikainen 0617dd6a93 Add generation of field data 2018-11-18 04:29:04 +02:00
Joel Lavikainen d99f9c53f7 Add migration with fix 2018-11-18 04:21:01 +02:00
Joel Lavikainen 3cfa0df43b Add missing lines to coverage report 2018-11-17 22:40:43 +02:00
Joel Lavikainen dc2982965e Add migration related to tag change 2018-11-17 22:30:03 +02:00
Joel Lavikainen 3c58d764bd Fix Feed link to Tag 2018-11-17 21:46:17 +02:00
Joel Lavikainen 4d2584dee4 Change Tag primary key to id 2018-11-17 21:45:26 +02:00
Joel Lavikainen 3294d6ffa0 Fix Tag serializer 2018-11-17 20:41:45 +02:00
Joel Lavikainen 8398928a97 Add dummy data generation for tag objects 2018-11-17 20:40:42 +02:00
Joel Lavikainen 09a2e09c1b Add tests for Tag REST api 2018-11-17 20:40:08 +02:00
Joel Lavikainen d0f5bc223b Add id to Tag data 2018-11-17 17:57:06 +02:00
Joel Lavikainen 7a58fb0af5 Add tag id support for Feed in REST 2018-11-17 17:52:35 +02:00
Joel Lavikainen 395c597a7f Add tags to REST API 2018-11-17 17:34:36 +02:00
Aarni Halinen e43734e32e Fix naive dates to aware datetimes 2018-10-25 14:36:51 +03:00
Aarni Halinen eb5659d0da Minor cleanup of infoscreen 2018-10-24 20:54:31 +03:00
Aarni Halinen 50268b98a9 Remove underscore.js 2018-10-24 20:54:08 +03:00
Aarni Halinen 4a2a5f9d76 Bugfix #117: API Event tags
Add API for tags so events can get the related field.
2018-10-23 14:45:08 +03:00
Aarni Halinen ef6b8ed5a5 Merge branch 'develop' into 'master'
Kaehmy translations

See merge request vtmk/web2.0!129
2018-10-20 23:24:04 +03:00
Aarni Halinen b1eda70e7a Kaehmy translations 2018-10-20 23:14:48 +03:00
Aarni Halinen 2ae9ee7352 Merge branch 'develop' into 'master'
GDPR kaehmy

See merge request vtmk/web2.0!128
2018-10-20 23:00:59 +03:00
Aarni Halinen f7b00ab3cc Add GDPR checkbox 2018-10-20 22:51:42 +03:00
Aarni Halinen 9cad12d879 Login required for kaehmy export page 2018-10-20 22:39:22 +03:00
Aarni Halinen 5967d0f7b3 Merge branch 'develop' into 'master'
Replace kahmyopas.pdf

See merge request vtmk/web2.0!127
2018-10-19 13:50:51 +03:00
Aarni Halinen d4800c449d Replace kahmyopas.pdf 2018-10-19 13:41:27 +03:00
Aarni Halinen 8f9c504bec Merge branch 'develop' into 'master'
Update kaehmy banner

See merge request vtmk/web2.0!126
2018-10-18 23:31:30 +03:00