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 |
|
Ramon Wenger
|
de62252824
|
Fix unit tests
|
2020-03-05 16:54:56 +01:00 |
|
Ramon Wenger
|
f4270b8243
|
Remove actions in class list for students
|
2020-03-05 16:41:07 +01:00 |
|
Ramon Wenger
|
4a3d08203d
|
Enable adding previous members to school classes
|
2020-03-05 16:18:30 +01:00 |
|
Ramon Wenger
|
b82b82369c
|
Add mutation to remove member from class
|
2020-03-05 15:14:26 +01:00 |
|
Ramon Wenger
|
acdcc7ea13
|
Add class member node
|
2020-03-04 16:57:15 +01:00 |
|
Ramon Wenger
|
0ea72fe598
|
Rename UserSchoolClassConnection to SchoolClassMember
|
2020-03-04 16:57:15 +01:00 |
|
Ramon Wenger
|
35c981a2f2
|
Add through model to user school class connection, migrate all old
classes
|
2020-03-04 16:57:15 +01:00 |
|
Ramon Wenger
|
ab9da652cf
|
Allow multiple teachers per school class
For that purpose, now the enabled solutions are stored on a per school class
basis instead of a per teacher basis
|
2020-03-02 17:37:29 +01:00 |
|
Christian Cueni
|
096fe77d46
|
Remove call to dummy license command
|
2020-02-27 13:12:33 +01:00 |
|
Christian Cueni
|
7e91b606bd
|
Fix migrations
|
2020-02-27 10:41:30 +01:00 |
|
Christian Cueni
|
ed2f2c0557
|
Merged in hotfix/html-email (pull request #48)
Hotfix/html email
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2020-02-27 09:30:49 +00: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
|
bdee1875ff
|
Fix backend test
|
2020-02-27 09:20:21 +01:00 |
|
Christian Cueni
|
af818f5ee7
|
Send registration emails as html
|
2020-02-26 13:51:17 +01:00 |
|
Ramon Wenger
|
f4a98e50ba
|
Fix unit tests
|
2020-02-26 13:22:22 +01:00 |