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
..
beta-login.spec.js	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
bookmarks.spec.js	Add initial cypress test for students to join classes	2020-02-10 15:42:22 +01:00
coupon.spec.js	Fix cypress tests	2020-02-27 13:37:32 +01:00
current-module.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
email-verification.spec.js	Use remove error field, fix tests	2020-04-30 08:49:54 +02:00
home-page.spec.js	Add test for current module	2019-04-11 14:15:36 +02:00
login.spec.js	Fix login & tests	2020-02-18 10:05:07 +01:00
new-project.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
new-student.spec.js	Fix new student test	2020-03-20 10:43:00 +01:00
project-entry.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
registration.spec.js	Update registration tests	2020-02-27 15:05:45 +01:00
room-page.spec.js	Fix more tests 🤪	2020-02-27 16:03:22 +01:00
rooms-page.spec.js	Fix more tests 🤪	2020-02-27 16:03:22 +01:00
school-class.spec.js	Disable cypress test	2020-03-30 14:36:15 +02:00
solutions.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
spellcheck.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
survey.spec.js	Mock the backend for the cypress test	2020-02-12 21:01:26 +01:00