 Ramon Wenger
|
d0af9cfcfc
|
Merge branch 'feature/onboarding' into develop
|
2020-07-20 11:04:54 +02:00 |
|
Ramon Wenger
|
2c0039be42
|
Fix cypress tests
|
2020-07-10 15:15:56 +02:00 |
Christian Cueni
|
1045093cac
|
Add data migration
|
2020-07-07 11:42:41 +02:00 |
|
Christian Cueni
|
4944745da0
|
Add support for multiple licenses
|
2020-07-07 11:42:41 +02:00 |
|
Ramon Wenger
|
a2bbb6b26a
|
Update test settings
|
2020-06-30 11:37:52 +02:00 |
|
Christian Cueni
|
1b4a0da2e1
|
Merged in feature/news (pull request #65)
Feature/news
Approved-by: Ramon Wenger
|
2020-06-17 11:53:45 +00:00 |
|
Christian Cueni
|
22c2a44794
|
Save accepted terms in db
|
2020-06-04 13:19:17 +02:00 |
|
Christian Cueni
|
0b19f6c697
|
Rename app, update css classes
|
2020-06-03 13:25:53 +02:00 |
|
Christian Cueni
|
1437f465de
|
Add tiny font, update date language
|
2020-05-28 08:41:15 +02:00 |
|
Christian Cueni
|
7d153be053
|
Add newsteaser dummy data
|
2020-05-25 13:17:12 +02:00 |
|
Christian Cueni
|
5a042bb115
|
Add models and graphql
|
2020-05-20 11:55: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 |
|
Ramon Wenger
|
cd2e5c953e
|
Update instrument dummy data
|
2020-05-07 12:22:43 +02:00 |
|
Christian Cueni
|
9a2991961c
|
Update schema generation
|
2020-05-04 09:31:44 +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
|
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
|
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 |
|
Ramon Wenger
|
04ae5a22a8
|
Add new favicons
|
2020-04-08 14:16:03 +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
|
2fbc70f459
|
Add backend code to generate school class codes
|
2020-03-20 22:51:05 +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 |
|
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
|
de62252824
|
Fix unit tests
|
2020-03-05 16:54:56 +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
|
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
|
af818f5ee7
|
Send registration emails as html
|
2020-02-26 13:51:17 +01:00 |
|
Ramon Wenger
|
10349d91b5
|
Update dummy data
|
2020-02-26 12:46:10 +01:00 |
|
Christian Cueni
|
13295e2d2e
|
Fix tests
|
2020-02-25 16:12:01 +01:00 |
|
Christian Cueni
|
93798358ea
|
Use html emails
|
2020-02-25 14:54:02 +01:00 |
|
Christian Cueni
|
b572523a33
|
Add proxy for registration call
|
2020-02-25 14:42:42 +01:00 |
|
Christian Cueni
|
950faf1c9c
|
Merged in hotfix/html-email (pull request #47)
Add html links to emails
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2020-02-25 13:23:11 +00:00 |
|
Christian Cueni
|
d44e38c04c
|
Add tag for link generation
|
2020-02-25 10:28:57 +01:00 |
|
Christian Cueni
|
fff752f59d
|
Add update admin token command
|
2020-02-24 16:22:48 +01:00 |
|
Christian Cueni
|
f62d2ad5ef
|
Fix license sync
|
2020-02-24 16:12:40 +01:00 |
|
Christian Cueni
|
f24f828a45
|
Add html links to emails
|
2020-02-24 13:19:27 +01:00 |