Commit Graph

195 Commits

Author SHA1 Message Date
Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing
# Conflicts:
#	Pipfile.lock
#	client/cypress/fixtures/schema.json
#	client/src/graphql/client.js
#	client/src/graphql/resolvers.js
#	client/src/graphql/typedefs.js
#	client/src/main.js
#	client/src/router/index.js
#	server/users/models.py
2020-02-27 10:29:24 +01:00
Ramon Wenger 10349d91b5 Update dummy data 2020-02-26 12:46:10 +01:00
Christian Cueni 13295e2d2e Fix tests 2020-02-25 16:12:01 +01:00
Christian Cueni b572523a33 Add proxy for registration call 2020-02-25 14:42:42 +01:00
Christian Cueni 950faf1c9c Merged in hotfix/html-email (pull request #47)
Add html links to emails

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2020-02-25 13:23:11 +00:00
Christian Cueni d44e38c04c Add tag for link generation 2020-02-25 10:28:57 +01:00
Christian Cueni fff752f59d Add update admin token command 2020-02-24 16:22:48 +01:00
Christian Cueni f62d2ad5ef Fix license sync 2020-02-24 16:12:40 +01:00
Christian Cueni f24f828a45 Add html links to emails 2020-02-24 13:19:27 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni 0df6cb9d93 Add cronjob for license-sync 2020-02-20 14:21:52 +01:00
Christian Cueni 96c0b3ee64 Move license to core 2020-02-20 13:22:15 +01:00
Christian Cueni 8d864fbf6e Remove legacy registration 2020-02-20 08:36:05 +01:00
Christian Cueni c93d2f6843 Remove hep id as default 2020-02-18 16:57:36 +01:00
Christian Cueni e067717d50 Fix local login 2020-02-18 16:01:20 +01:00
Christian Cueni cd24073675 Add local login tests in backend 2020-02-18 14:53:08 +01:00
Christian Cueni 3c72c9559e Split token and local login 2020-02-18 14:36:49 +01:00
Christian Cueni 42d16caafc Allow coupon calls 2020-02-18 14:10:04 +01:00
Ramon Wenger bd6e0f75ca Add code to school class dummy data 2020-02-18 10:23:27 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Christian Cueni 36c43bf4e1 Detect 402 in frontend, allow me query 2020-02-17 16:08:47 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Christian Cueni 7a532463a6 Update registration mutation with user id and hep calls 2020-02-13 12:32:55 +01:00
Christian Cueni 909f7337ac Fix email verification for stage 2020-02-13 11:28:23 +01:00
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 17fd7575b4 Add django silk to dev mode 2020-02-12 10:16:44 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Christian Cueni 68bba26c75 Add stage confirmation view 2020-02-11 14:40:34 +01:00
Christian Cueni ffb330223c Check minimal date 2020-02-11 14:40:34 +01:00
Christian Cueni 321163e542 Add coupons, refactor utility functions 2020-02-11 14:40:34 +01:00
Christian Cueni f628966ae9 Add registration, implement tests 2020-02-11 14:40:34 +01:00
Christian Cueni 6beb4296f7 Store admin token in db 2020-02-11 14:40:34 +01:00
Christian Cueni cd7f79072e Remove user token, use confirmation key 2020-02-11 14:40:34 +01:00
Christian Cueni 773547c883 Fix client, refactor user handling, fix tests 2020-02-11 14:40:33 +01:00
Christian Cueni 45f887287f Save group_id, verify email confirmed 2020-02-11 14:40:33 +01:00
Christian Cueni e98d2774fd Test user with no login 2020-02-11 14:40:33 +01:00
Christian Cueni 9c4e2de296 Select correct product (basic version) 2020-02-11 14:40:33 +01:00
Christian Cueni bc997bbeea Add login happy paths 2020-02-11 14:40:33 +01:00
Christian Cueni 87ceb5fc0e Setup views and tests 2020-02-11 14:40:33 +01:00
Christian Cueni 2e8be04328 Add basic rest calls 2020-02-11 14:38:43 +01:00
Ramon Wenger 5a58641183 Add registration of our assignments as taskbase tasks 2020-01-20 17:56:54 +01:00
Ramon Wenger 53ce39c887 Add taskbase config variables to settings 2020-01-20 13:01:00 +01:00
Ramon Wenger 17e061892a Fix assignment creation in dummy data 2020-01-20 12:53:49 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07:00 +01:00
Ramon Wenger 2192fea5a5 Enable GZip middleware on the server for leaner responses 2020-01-16 10:47:03 +01:00
Ramon Wenger 6f0cb0dd88 Add command for exporting assignments 2019-12-16 15:24:46 +01:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00
Ramon Wenger f6f61aaf05 Add bookmark action for modules 2019-12-03 15:06:47 +01:00
Ramon Wenger a06f32bcb0 Add bookmark action to chapter 2019-12-03 14:03:30 +01:00