Commit Graph

5 Commits

Author SHA1 Message Date
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
Ramon Wenger 879db2000b Toggle the new sidebar 2020-02-17 16:14:48 +01:00
Christian Cueni a0eeec4e18 Add extra fields to registration, remove unused fields 2020-02-11 14:44:14 +01:00
Christian Cueni 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Ramon Wenger 65a09fb9c7 Use the GQL cache for local state 2019-12-18 16:23:33 +01:00