Commit Graph

118 Commits

Author SHA1 Message Date
Christian Cueni a2554fbf37 Clean up code 2020-05-12 11:36:59 +02:00
Christian Cueni 9e940e31d8 Allow beta users to keep data after hep registration 2020-05-06 08:03:51 +02:00
Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing
# Conflicts:
#	client/config/dev.env.js
#	client/config/prod.env.js
#	client/cypress/fixtures/schema.json
#	client/cypress/integration/beta-login.spec.js
#	client/package-lock.json
#	client/src/graphql/client.js
#	client/src/layouts/PublicLayout.vue
#	client/src/main.js
#	client/src/styles/main.scss
#	server/core/settings.py
#	server/registration/mutations_public.py
#	server/users/factories.py
#	server/users/models.py
#	server/users/schema.py
2020-04-30 15:22:55 +02:00
Ramon Wenger 7a84c2f043 Fix default class name generation 2020-04-01 09:37:54 +02:00
Ramon Wenger 2fbc70f459 Add backend code to generate school class codes 2020-03-20 22:51:05 +01:00
Ramon Wenger aa9e72b087 Set selected class to newly joined or created one 2020-03-19 13:49:29 +01:00
Ramon Wenger dbf2ba0832 Add mutation for creating new school classes with tests 2020-03-19 11:33:56 +01:00
Christian Cueni 737b682855 Add comments, clean up code 2020-03-17 16:13:00 +01:00
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger b3b02acfef Fix login for users with no school class 2020-03-10 11:03:06 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Ramon Wenger 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni b2d8c374c0 Raise exception in Backend 2020-03-09 13:51:46 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00
Ramon Wenger de62252824 Fix unit tests 2020-03-05 16:54:56 +01:00
Ramon Wenger f4270b8243 Remove actions in class list for students 2020-03-05 16:41:07 +01:00
Ramon Wenger 4a3d08203d Enable adding previous members to school classes 2020-03-05 16:18:30 +01:00
Ramon Wenger b82b82369c Add mutation to remove member from class 2020-03-05 15:14:26 +01:00
Ramon Wenger acdcc7ea13 Add class member node 2020-03-04 16:57:15 +01:00
Ramon Wenger 0ea72fe598 Rename UserSchoolClassConnection to SchoolClassMember 2020-03-04 16:57:15 +01:00
Ramon Wenger 35c981a2f2 Add through model to user school class connection, migrate all old
classes
2020-03-04 16:57:15 +01:00
Ramon Wenger ab9da652cf Allow multiple teachers per school class
For that purpose, now the enabled solutions are stored on a per school class
basis instead of a per teacher basis
2020-03-02 17:37:29 +01:00
Christian Cueni 7e91b606bd Fix migrations 2020-02-27 10:41:30 +01: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
Ramon Wenger f4a98e50ba Fix unit tests 2020-02-26 13:22:22 +01:00
Ramon Wenger 10349d91b5 Update dummy data 2020-02-26 12:46:10 +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
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
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 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 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 f3bd38e819 Redirect users without license to coupon page 2020-02-18 13:48:45 +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 c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Ramon Wenger 99487c9705 Add unit tests 2020-02-12 20:29:22 +01:00
Ramon Wenger 2682b876b8 Prevent joining the same class again 2020-02-12 20:29:05 +01:00
Christian Cueni f5ddff12e3 Add email verification tests 2020-02-12 15:49:56 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni 057e65a82f Fix urls, reset new migrations 2020-02-11 14:40:34 +01:00
Christian Cueni 75e1597d6f Update email if user changed on hep 2020-02-11 14:40:34 +01:00