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
..
management	Update user expiry field, fix tests	2020-02-26 10:31:35 +01:00
migrations	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
tests	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
__init__.py	Rename folder user to users	2018-10-10 09:40:24 +02:00
admin.py	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
apps.py	Rename folder user to users	2018-10-10 09:40:24 +02:00
factories.py	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
forms.py	Extend user admin	2018-10-22 19:01:20 +02:00
inputs.py	Remove year from school class model	2019-07-03 11:58:25 +02:00
managers.py	Fix backend test	2020-02-27 09:20:21 +01:00
models.py	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
mutations.py	Set selected class to newly joined or created one	2020-03-19 13:49:29 +01:00
mutations_public.py	Rename LocalLogin -> BetaLogin	2020-03-09 15:47:50 +01:00
schema.py	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
serializers.py	Add registration backend	2019-11-11 18:19:34 +01:00
services.py	Fix unit tests	2020-02-26 13:22:22 +01:00
user_signup_login_handler.py	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00