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
|
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 |
|
Ramon Wenger
|
611a066c65
|
Add button to change the school class name
|
2020-03-14 11:27:16 +01:00 |
|
Ramon Wenger
|
b3b02acfef
|
Fix login for users with no school class
|
2020-03-10 11:03:06 +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
|
7e91b606bd
|
Fix migrations
|
2020-02-27 10:41:30 +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
|
bdee1875ff
|
Fix backend test
|
2020-02-27 09:20:21 +01:00 |
|
Ramon Wenger
|
f4a98e50ba
|
Fix unit tests
|
2020-02-26 13:22:22 +01:00 |
|
Ramon Wenger
|
10349d91b5
|
Update dummy data
|
2020-02-26 12:46:10 +01:00 |
|
Christian Cueni
|
a5e1b323a2
|
Synd HEP data
|
2020-02-26 11:12:13 +01:00 |
|
Christian Cueni
|
4e2c47d00a
|
Update user expiry field, fix tests
|
2020-02-26 10:31:35 +01:00 |
|
Ramon Wenger
|
1623cd3265
|
Fix unit tests
|
2020-02-24 18:54:46 +01:00 |
|
Ramon Wenger
|
2e1d7b46bc
|
Add error message and add styling
|
2020-02-24 18:32:55 +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
|
f8fab82851
|
Finish coupon flow
|
2020-02-24 11:30:37 +01:00 |
|
Christian Cueni
|
0df6cb9d93
|
Add cronjob for license-sync
|
2020-02-20 14:21:52 +01:00 |
|
Christian Cueni
|
96c0b3ee64
|
Move license to core
|
2020-02-20 13:22:15 +01:00 |
|
Christian Cueni
|
e067717d50
|
Fix local login
|
2020-02-18 16:01:20 +01:00 |
|
Christian Cueni
|
cd24073675
|
Add local login tests in backend
|
2020-02-18 14:53:08 +01:00 |
|
Christian Cueni
|
3c72c9559e
|
Split token and local login
|
2020-02-18 14:36:49 +01:00 |
|
Christian Cueni
|
f3bd38e819
|
Redirect users without license to coupon page
|
2020-02-18 13:48:45 +01:00 |
|
Ramon Wenger
|
bd6e0f75ca
|
Add code to school class dummy data
|
2020-02-18 10:23:27 +01:00 |
|
Christian Cueni
|
677d8dbf44
|
Fix login & tests
|
2020-02-18 10:05:07 +01:00 |
|
Christian Cueni
|
c9c42e2296
|
Check user license in Api, save
|
2020-02-17 15:08:06 +01:00 |
|
Ramon Wenger
|
99487c9705
|
Add unit tests
|
2020-02-12 20:29:22 +01:00 |
|
Ramon Wenger
|
2682b876b8
|
Prevent joining the same class again
|
2020-02-12 20:29:05 +01:00 |
|
Christian Cueni
|
f5ddff12e3
|
Add email verification tests
|
2020-02-12 15:49:56 +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
|
0922c5d198
|
Fix local signup, style header
|
2020-02-11 14:44:57 +01:00 |
|
Christian Cueni
|
057e65a82f
|
Fix urls, reset new migrations
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
75e1597d6f
|
Update email if user changed on hep
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
321163e542
|
Add coupons, refactor utility functions
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
23028c779b
|
Refactor login
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
f628966ae9
|
Add registration, implement tests
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
6beb4296f7
|
Store admin token in db
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
cd7f79072e
|
Remove user token, use confirmation key
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
773547c883
|
Fix client, refactor user handling, fix tests
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
45f887287f
|
Save group_id, verify email confirmed
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
a2f634a677
|
Use token
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
dbc4f6f2ee
|
Handle network error
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
c13ed2a5b2
|
Verify valid product, move default school creation
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
0e95e872c8
|
Verify valid product
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
8c9d40cbc7
|
Verify error message
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
9856693ea6
|
Test no validated email case
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
e98d2774fd
|
Test user with no login
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
9c4e2de296
|
Select correct product (basic version)
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
bc997bbeea
|
Add login happy paths
|
2020-02-11 14:40:33 +01:00 |
|
Christian Cueni
|
87ceb5fc0e
|
Setup views and tests
|
2020-02-11 14:40:33 +01:00 |
|
Ramon Wenger
|
66842ac1d8
|
Add instruments to the my activity page
|
2020-02-05 11:35:04 +01:00 |
Ramon Wenger
|
1549cde151
|
Update MyActivity query to include more activities
|
2019-12-18 13:11:32 +01:00 |
|
Christian Cueni
|
f84efc7f1c
|
Add mutations and tests
|
2019-11-13 16:29:53 +01:00 |
|
Christian Cueni
|
e2f5c0b3f0
|
Fix copy, fix styles on server
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
b20917d29a
|
Validate license on login
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
bceb01c5f4
|
Add and update tests, add dummy data
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
981b99ced7
|
Fix copy, fix mutation fields
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
80fce17efb
|
Create class after regsitration
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
0b48607398
|
Add registration backend
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
13e3192776
|
Remove graphql password reset, style django pages
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
062269f030
|
Add loggedIn guard, add basic login component
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
fb225b926d
|
Add login tests
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
7e92753977
|
Add password reset tests
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
46518a22f8
|
Add password reset mutations
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
7d6a03743c
|
Add login endpoint
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
e982579711
|
Add public graphql endpoint
|
2019-10-08 09:30:00 +02:00 |
|
Ramon Wenger
|
4ae9c5813f
|
Merged in feature/survey-with-correct-answer (pull request #34)
Feature/survey with correct answer
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2019-09-11 11:02:37 +00:00 |
|
Ramon Wenger
|
9e4784e5d8
|
Add helper functions to find the teacher of a user
|
2019-09-09 14:01:58 +02:00 |
|
Ramon Wenger
|
75ba289100
|
Upate school class definion to not require a user when creating one
|
2019-09-04 16:12:15 +02:00 |
|
Christian Cueni
|
638bea0cd0
|
Use cache to propagate changes, add tests, style popover
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
0af01b4a48
|
Add mutation test
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
91967ceb21
|
Add mutations and query, fix 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
|
7d46ec9ef0
|
Make school class name unique
|
2019-07-03 11:59:31 +02:00 |
|
Ramon Wenger
|
0e3ed9ea7a
|
Remove year from school class model
|
2019-07-03 11:58:25 +02:00 |
|
Christian Cueni
|
4688a29122
|
Clean up code
|
2019-04-25 10:57:13 +02:00 |
|
Christian Cueni
|
aca8bd0d2d
|
Add possibility to upload avatars
|
2019-04-24 14:23:54 +02:00 |
|
Christian Cueni
|
f8c1f372cb
|
merge develop into feature/pw-reset
|
2019-04-11 08:14:08 +02:00 |
|
Christian Cueni
|
aca36b8a66
|
resolve conflicts
|
2019-04-10 09:37:42 +02:00 |
|
Christian Cueni
|
42c579b047
|
use me query, add components
|
2019-04-09 16:24:05 +02:00 |
|
Christian Cueni
|
8b53d2fa7e
|
add my schoolclasses query, fix test
|
2019-04-09 11:27:30 +02:00 |
|
Christian Cueni
|
f3289ba881
|
add subnavigation, minor cleanup
|
2019-04-08 17:11:08 +02:00 |
|
Christian Cueni
|
13685b082e
|
rename components, add cypress tests, update hash
|
2019-04-08 14:18:43 +02:00 |
|
Christian Cueni
|
e3575bcf97
|
Handle backenderrors in frontend
|
2019-04-04 15:57:02 +02:00 |
|
Christian Cueni
|
d64c641661
|
Add pw change endpoint in API
|
2019-04-03 15:53:00 +02:00 |
|
Christian Cueni
|
d9f07c1adb
|
refactor widget footer, add possibility to delete project
|
2019-03-27 09:33:12 +01:00 |
|
Christian Cueni
|
ba1e63a84b
|
restrict access to users and rooms, add tests
|
2019-03-14 12:12:31 +01:00 |
|
Ramon Wenger
|
10b35a5a3e
|
Add last visited module to user
|
2019-03-01 11:19:43 +01:00 |
|
Ramon Wenger
|
3416465f8a
|
Add string representation to student submission
|
2018-10-25 17:08:38 +02:00 |
|
Ramon Wenger
|
ee8e33e026
|
Remove role from GQL query
|
2018-10-24 15:16:31 +02:00 |
|
Ramon Wenger
|
c5750a199b
|
Extend user admin
|
2018-10-22 19:01:20 +02:00 |
|
Ramon Wenger
|
7e88642918
|
Remove order property from module
|
2018-10-17 15:48:14 +02:00 |
|
Ramon Wenger
|
a4479727ce
|
Add another unit test
|
2018-10-16 13:52:40 +02:00 |
|
Ramon Wenger
|
5218a3a867
|
Limit submissions to teacher of student's class
|
2018-10-16 13:36:32 +02:00 |
|
Ramon Wenger
|
8dc5d7dfaf
|
Add initial tests for assignment
|
2018-10-15 20:08:32 +02:00 |
|
Ramon Wenger
|
0f5d9f80af
|
Remove school model, refactor code
|
2018-10-15 15:03:25 +02:00 |
|
Ramon Wenger
|
72cab13b36
|
Add default users
|
2018-10-15 13:54:34 +02:00 |
|
Ramon Wenger
|
e1deb19ca8
|
Re-do all migrations
|
2018-10-11 15:47:12 +02:00 |
|
Ramon Wenger
|
eafff751f8
|
Filter content blocks by permission and ownership
|
2018-10-10 14:18:15 +02:00 |
|
Ramon Wenger
|
645c998d5c
|
Add 'user created' property on user created content blocks
|
2018-10-10 10:34:30 +02:00 |
|
Ramon Wenger
|
9fed2b8422
|
Rename folder user to users
|
2018-10-10 09:40:24 +02:00 |