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
..
__init__.py	initial commit	2018-08-06 23:26:23 +02:00
apps.py	initial commit	2018-08-06 23:26:23 +02:00
graphene_wagtail.py	Add survey block to content block in back- and frontend	2019-07-24 14:23:27 +02:00
schema.py	Add coupon call in frontend, add tests, fix api	2020-02-13 10:03:00 +01:00
schema_public.py	Add email verification tests	2020-02-12 15:49:56 +01:00
test_utils.py	Add new tests for projects	2019-03-29 16:37:48 +01:00
urls.py	Add proxy for registration call	2020-02-25 14:42:42 +01:00
utils.py	Add comment to code	2020-03-10 11:39:12 +01:00