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
..
assignments.json	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
example.json	Add cypress test runner and some initial e2e tests	2018-10-23 13:39:46 +02:00
me.join-class.json	Add new cypress test and fix old ones	2020-03-10 10:16:30 +01:00
me.new-student.json	Change redirect for new student, also add new test	2020-02-26 12:48:30 +01:00
module-geld.json	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
module.json	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
schema.json	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
schema_public.json	Remove error field from query	2020-04-30 09:12:36 +02:00
selected-school-class.json	Add new cypress test and fix old ones	2020-03-10 10:16:30 +01:00
spell-check.json	Update schema, fix cypress test	2020-02-04 22:05:12 +01:00