Commit Graph

1495 Commits

Author SHA1 Message Date
Christian Cueni 59f650891c Remove change password test 2020-02-27 11:37:24 +01:00
Christian Cueni 7e91b606bd Fix migrations 2020-02-27 10:41:30 +01:00
Christian Cueni ed2f2c0557 Merged in hotfix/html-email (pull request #48)
Hotfix/html email

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2020-02-27 09:30:49 +00:00
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
Christian Cueni bdee1875ff Fix backend test 2020-02-27 09:20:21 +01:00
Christian Cueni 8f9750ebe8 Style beta login pages 2020-02-27 09:10:25 +01:00
Ramon Wenger 162615ce5c Remove password change form 2020-02-26 18:36:31 +01:00
Ramon Wenger 5054f21bc9 Update wording 2020-02-26 16:01:26 +01:00
Christian Cueni af818f5ee7 Send registration emails as html 2020-02-26 13:51:17 +01:00
Ramon Wenger f4a98e50ba Fix unit tests 2020-02-26 13:22:22 +01:00
Ramon Wenger 1c71c24ea0 Change redirect for new student, also add new test 2020-02-26 12:48:30 +01:00
Ramon Wenger e869cc8829 Add mixin for `me` query 2020-02-26 12:48:07 +01:00
Ramon Wenger dccbf2ae1a Fix cypress test 2020-02-26 12:47:33 +01:00
Ramon Wenger 0ffe77b745 Add more data properties 2020-02-26 12:47:20 +01:00
Ramon Wenger 10349d91b5 Update dummy data 2020-02-26 12:46:10 +01:00
Christian Cueni 5e77ee0cee Fix helloEmail, make linter happy 2020-02-26 12:44:41 +01:00
Christian Cueni a5e1b323a2 Synd HEP data 2020-02-26 11:12:13 +01:00
Christian Cueni 4e2c47d00a Update user expiry field, fix tests 2020-02-26 10:31:35 +01:00
Christian Cueni 3d63a7933d Rename local login url 2020-02-25 16:22:27 +01:00
Christian Cueni 13295e2d2e Fix tests 2020-02-25 16:12:01 +01:00
Ramon Wenger ee78a3229f Refactor mixins 2020-02-25 15:46:11 +01:00
Ramon Wenger 4f7a2cdc2f Move class selection to sidebar, refactor it in the process 2020-02-25 15:46:11 +01:00
Christian Cueni 93798358ea Use html emails 2020-02-25 14:54:02 +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
Ramon Wenger a7413c6ce0 Merged in feature/multiple-classes-for-everyone (pull request #46)
Feature/multiple classes for everyone

Approved-by: Christian Cueni
2020-02-25 08:42:21 +00:00
Ramon Wenger 1623cd3265 Fix unit tests 2020-02-24 18:54:46 +01:00
Ramon Wenger 2e1d7b46bc Add error message and add styling 2020-02-24 18:32:55 +01:00
Ramon Wenger a59733b2f1 Add redirect after joining class 2020-02-24 16:23:55 +01:00
Christian Cueni fff752f59d Add update admin token command 2020-02-24 16:22:48 +01:00
Ramon Wenger 35befbf40f Merge branch 'hotfix/postgres-pipelines' into develop 2020-02-24 16:13:39 +01:00
Christian Cueni f62d2ad5ef Fix license sync 2020-02-24 16:12:40 +01:00
Ramon Wenger ca97a15398 Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone 2020-02-24 16:11:25 +01:00
Christian Cueni a481989348 Add footer 2020-02-24 15:17:11 +01:00
Christian Cueni f24f828a45 Add html links to emails 2020-02-24 13:19:27 +01:00
Christian Cueni a28c462a1e Merge branch 'hotfix/postgres-pipelines' into feature/licensing 2020-02-24 11:32:18 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Ramon Wenger a74fe9d7b0 Fix pipelines 2020-02-24 10:42:04 +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 1152f1fd95 Add forgot password page, add cancel button to login 2020-02-20 11:24:10 +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 e9713c736b Redirect to hello, add redirect query param 2020-02-18 16:32:12 +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
Christian Cueni f3bd38e819 Redirect users without license to coupon page 2020-02-18 13:48:45 +01:00