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
..
assets	Clean up style files	2018-08-09 14:54:18 +02:00
components	Remove password change form	2020-02-26 18:36:31 +01:00
directives	Add auto grow directive to textarea	2019-07-11 13:55:39 +02:00
filters	Add dynamic project entry display and creation to frontend	2019-03-13 17:55:13 +01:00
graphql	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
helpers	Clean up code	2020-01-16 14:10:16 +01:00
hep-client	Add proxy for registration call	2020-02-25 14:42:42 +01:00
layouts	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
mixins	Add mixin for `me` query	2020-02-26 12:48:07 +01:00
pages	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
router	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
store	Add note to instruments	2020-01-16 10:45:36 +01:00
styles	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
App.vue	Add instruments to mobile subnavigation	2019-11-26 16:57:22 +01:00
main.js	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
survey.config.js	Add custom style for dropdowns	2019-07-31 15:33:00 +02:00