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
..
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	Mock the backend for the cypress test	2020-02-12 21:01:26 +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-02-27 10:29:24 +01:00
schema_public.json	Split token and local login	2020-02-18 14:36:49 +01:00
spell-check.json	Update schema, fix cypress test	2020-02-04 22:05:12 +01:00