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
..
bookmarks.spec.js	Add initial cypress test for students to join classes	2020-02-10 15:42:22 +01:00
change-password-spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
coupon.spec.js	Add coupon call in frontend, add tests, fix api	2020-02-13 10:03:00 +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	Check user license in Api, save	2020-02-17 15:08:06 +01:00
home-page-logged-in.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
home-page.spec.js	Add test for current module	2019-04-11 14:15:36 +02:00
join-class.spec.js	Fix cypress test	2020-02-26 12:47:33 +01:00
local-login.spec.js	Fix local login	2020-02-18 16:01:20 +01: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	Change redirect for new student, also add new test	2020-02-26 12:48:30 +01:00
project-entry.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
registration.spec.js	Add email verification tests	2020-02-12 15:49:56 +01:00
room-page.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01:00
rooms-page.spec.js	Update cypress tests to mock the server	2020-01-20 17:14:20 +01: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