Commit Graph

592 Commits

Author SHA1 Message Date
Ramon Wenger 93d7a3f959 Add environment information to frontend dev server 2020-05-27 10:12:18 +02:00
Ramon Wenger 7ef761cf58 Generate missing migrations 2020-05-26 16:05:21 +02:00
Ramon Wenger 09153782d5 Fix dummy data 2020-05-26 11:19:06 +02:00
Christian Cueni 7ac181dd33 Fix middleware tests 2020-05-12 15:57:54 +02:00
Christian Cueni 249a0f7ca1 Fix middleware 2020-05-12 15:39:20 +02:00
Christian Cueni ce299e0f0e Merged in feature/licensing (pull request #50)
Feature/licensing
2020-05-12 11:37:17 +00:00
Christian Cueni 03a977b974 Fix tests 2020-05-12 11:44:35 +02:00
Christian Cueni a2554fbf37 Clean up code 2020-05-12 11:36:59 +02:00
Christian Cueni d159876472 Rename input variable 2020-05-12 11:20:43 +02:00
Christian Cueni 685fa3ff34 Use built-in graphql errors 2020-05-12 09:56:48 +02:00
Christian Cueni edd431671f Remove unused variables, simplify tests 2020-05-12 08:11:51 +02:00
Ramon Wenger cd2e5c953e Update instrument dummy data 2020-05-07 12:22:43 +02:00
Christian Cueni 9e940e31d8 Allow beta users to keep data after hep registration 2020-05-06 08:03:51 +02:00
Christian Cueni 9a2991961c Update schema generation 2020-05-04 09:31:44 +02:00
Christian Cueni b7e929e9dd Add patch to test 2020-05-04 08:48:37 +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
Christian Cueni e147ca65e0 Fix date comparison 2020-04-30 13:17:33 +02:00
Christian Cueni 0aa1625837 Update links, add group_id in customer 2020-04-30 12:16:24 +02:00
Christian Cueni 1bc2436a8b Merge branch 'develop' into feature/licensing
# Conflicts:
#	server/core/settings.py
#	server/core/urls.py
#	server/core/views.py
2020-04-30 09:49:22 +02:00
Christian Cueni ebc8d070f6 Remove error field from query 2020-04-30 09:12:36 +02:00
Christian Cueni d46cc7a177 Use remove error field, fix tests 2020-04-30 08:49:54 +02:00
Christian Cueni 1ca982dd24 Fix settings 2020-04-30 07:49:48 +02:00
Christian Cueni 57e7122fef Update ISBN 2020-04-30 07:03:56 +02:00
Christian Cueni d10517b4f5 Update env variables 2020-04-30 06:49:18 +02:00
Christian Cueni b14ed2fb5a Change url, add group_id 2020-04-27 08:14:39 +02:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger 8774b8d324 Add instructions property to topic model 2020-04-10 21:24:15 +02:00
Ramon Wenger 9bf7f2e9fa Merged feature/new-favicons into develop 2020-04-09 09:57:46 +02:00
Ramon Wenger 04ae5a22a8 Add new favicons 2020-04-08 14:16:03 +02:00
Ramon Wenger dc66293684 Add interdisciplinary instrument 2020-04-08 10:50:06 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger ad3e3fa629 Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
Ramon Wenger 7a84c2f043 Fix default class name generation 2020-04-01 09:37:54 +02:00
Ramon Wenger 2fbc70f459 Add backend code to generate school class codes 2020-03-20 22:51:05 +01:00
Ramon Wenger aa9e72b087 Set selected class to newly joined or created one 2020-03-19 13:49:29 +01:00
Ramon Wenger dbf2ba0832 Add mutation for creating new school classes with tests 2020-03-19 11:33:56 +01:00
Christian Cueni 737b682855 Add comments, clean up code 2020-03-17 16:13:00 +01:00
Christian Cueni 0e52ab6f49 Clean up code 2020-03-17 14:20:06 +01:00
Ramon Wenger 7b66d9b71b Add dedicated django command for cypress schema 2020-03-16 10:05:29 +01:00
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger 7c9d425a5e Clean up code 2020-03-12 18:06:05 +01:00
Ramon Wenger 1da6a00d40 Merged in feature/active-and-inactive-users-in-class (pull request #49)
Feature/active and inactive users in class

Approved-by: Christian Cueni
2020-03-10 15:01:53 +00:00
Ramon Wenger 6205846b80 Clean up code, change some minor things 2020-03-10 11:40:24 +01:00
Ramon Wenger 3e2b1f66a9 Add comment to code 2020-03-10 11:39:12 +01:00
Ramon Wenger b3b02acfef Fix login for users with no school class 2020-03-10 11:03:06 +01:00
Christian Cueni 5d614dd7e5 Fix minor issues 2020-03-09 16:22:56 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Ramon Wenger 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni b2d8c374c0 Raise exception in Backend 2020-03-09 13:51:46 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00