Commit Graph

18 Commits

Author SHA1 Message Date
Ramon Wenger dcd8420419 Merge branch 'feature/snapshots' into develop 2021-06-06 19:06:14 +02:00
Ramon Wenger a43dffc7f7 Add team admin 2021-05-25 19:17:00 +02:00
Christian Cueni d7a9629139 Display hep_id in list view 2021-05-10 08:31:16 +02:00
Ramon Wenger b94ce40313 Update assignment admin fields 2021-01-14 20:37:32 +01:00
Ramon Wenger d4063286fe Add search fields to school class admin 2020-07-22 11:39:29 +02:00
Christian Cueni dcb886a17c Show if user has accepted terms and condition in admin 2020-07-07 11:42:41 +02:00
Christian Cueni 1045093cac Add data migration 2020-07-07 11:42:41 +02:00
Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing
# Conflicts:
#	client/config/dev.env.js
#	client/config/prod.env.js
#	client/cypress/fixtures/schema.json
#	client/cypress/integration/beta-login.spec.js
#	client/package-lock.json
#	client/src/graphql/client.js
#	client/src/layouts/PublicLayout.vue
#	client/src/main.js
#	client/src/styles/main.scss
#	server/core/settings.py
#	server/registration/mutations_public.py
#	server/users/factories.py
#	server/users/models.py
#	server/users/schema.py
2020-04-30 15:22:55 +02:00
Ramon Wenger b82b82369c Add mutation to remove member from class 2020-03-05 15:14:26 +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 96c0b3ee64 Move license to core 2020-02-20 13:22:15 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +01:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Ramon Wenger 7ca7dbe4dd Add school classes to admin view 2019-07-04 10:18:23 +02:00
Ramon Wenger 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +02:00
Ramon Wenger c5750a199b Extend user admin 2018-10-22 19:01:20 +02:00
Ramon Wenger 0f5d9f80af Remove school model, refactor code 2018-10-15 15:03:25 +02:00
Ramon Wenger 9fed2b8422 Rename folder user to users 2018-10-10 09:40:24 +02:00