Commit Graph

6 Commits

Author SHA1 Message Date
Christian Cueni ca90f32e03 Fix cypress tests 2020-02-27 13:37:32 +01:00
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
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 97469ce419 Mock the backend for the cypress test 2020-02-12 21:01:26 +01:00
Ramon Wenger c4cacac1c7 Update schema, fix cypress test 2020-02-04 22:05:12 +01:00
Ramon Wenger cdb2570203 Add schema file, also add instructions to readme 2020-01-20 13:02:27 +01:00