 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 |
|
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 |
|
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 |
|
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 |
|
Ramon Wenger
|
ca97a15398
|
Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone
|
2020-02-24 16:11:25 +01:00 |
|
Christian Cueni
|
f24f828a45
|
Add html links to emails
|
2020-02-24 13:19:27 +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
|
8d864fbf6e
|
Remove legacy registration
|
2020-02-20 08:36:05 +01:00 |
|
Christian Cueni
|
c93d2f6843
|
Remove hep id as default
|
2020-02-18 16:57:36 +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
|
42d16caafc
|
Allow coupon calls
|
2020-02-18 14:10:04 +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
|
36c43bf4e1
|
Detect 402 in frontend, allow me query
|
2020-02-17 16:08:47 +01:00 |
|
Christian Cueni
|
c9c42e2296
|
Check user license in Api, save
|
2020-02-17 15:08:06 +01:00 |
|
Christian Cueni
|
7a532463a6
|
Update registration mutation with user id and hep calls
|
2020-02-13 12:32:55 +01:00 |
|
Christian Cueni
|
909f7337ac
|
Fix email verification for stage
|
2020-02-13 11:28:23 +01:00 |
|
Christian Cueni
|
82c1135f0e
|
Add coupon call in frontend, add tests, fix api
|
2020-02-13 10:03:00 +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 |
|
Ramon Wenger
|
17fd7575b4
|
Add django silk to dev mode
|
2020-02-12 10:16:44 +01:00 |
|
Christian Cueni
|
0922c5d198
|
Fix local signup, style header
|
2020-02-11 14:44:57 +01:00 |
|
Christian Cueni
|
587d661ca8
|
Add hello page, add local mutation
|
2020-02-11 14:42:58 +01:00 |
|
Christian Cueni
|
057e65a82f
|
Fix urls, reset new migrations
|
2020-02-11 14:40:34 +01:00 |
|
Christian Cueni
|
68bba26c75
|
Add stage confirmation view
|
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
|
ffb330223c
|
Check minimal date
|
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 |
|
Christian Cueni
|
2e8be04328
|
Add basic rest calls
|
2020-02-11 14:38:43 +01:00 |
|
Ramon Wenger
|
680b78e904
|
Only show instruments that are live and not only a draft
|
2020-02-10 15:37:03 +01:00 |
|
Ramon Wenger
|
12f3b2d9a7
|
Simplify the logic of visible content blocks for students
|
2020-02-10 09:27:43 +01:00 |
|
Ramon Wenger
|
542c7c6d84
|
Merged in feature/taskbase-spellcheck (pull request #45)
Feature/taskbase spellcheck
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2020-02-06 14:16:40 +00:00 |
|
Ramon Wenger
|
d11d494fae
|
Clean up code
|
2020-02-06 15:06:50 +01:00 |
|
Ramon Wenger
|
66842ac1d8
|
Add instruments to the my activity page
|
2020-02-05 11:35:04 +01:00 |
|
Ramon Wenger
|
c4cacac1c7
|
Update schema, fix cypress test
|
2020-02-04 22:05:12 +01:00 |
|
Ramon Wenger
|
ec1d68dd51
|
Add sentence offset to spell check results
Without that property, the offset always just starts at the current
sentence, not the whole user input
|
2020-02-03 15:04:52 +01:00 |
|
Ramon Wenger
|
5a58641183
|
Add registration of our assignments as taskbase tasks
|
2020-01-20 17:56:54 +01:00 |
|
Ramon Wenger
|
c9222adf60
|
Update cypress tests to mock the server
|
2020-01-20 17:14:20 +01:00 |
Ramon Wenger
|
53ce39c887
|
Add taskbase config variables to settings
|
2020-01-20 13:01:00 +01:00 |
|
Ramon Wenger
|
bdda817533
|
Add spell check module to backend
|
2020-01-20 13:00:31 +01:00 |
|
Ramon Wenger
|
17e061892a
|
Fix assignment creation in dummy data
|
2020-01-20 12:53:49 +01:00 |
|
Ramon Wenger
|
cb1a6fda19
|
Add taskbase id field to assignments
|
2020-01-20 12:53:49 +01:00 |
|
Ramon Wenger
|
90bc6139d3
|
Fix prefetch statements
|
2020-01-16 16:46:43 +01:00 |
|
Ramon Wenger
|
53b0594207
|
Fix unit tests
|
2020-01-16 16:36:27 +01:00 |
|
Ramon Wenger
|
6b8b520bc5
|
Add test to check solution display in surveys
|
2020-01-16 16:07:00 +01:00 |
|
Ramon Wenger
|
00b2b02113
|
Use slug to identify module when toggling solutions
|
2020-01-16 15:49:50 +01:00 |
|
Ramon Wenger
|
8c908fddd2
|
Use slug to identify modules for the bookmark mutation
|
2020-01-16 15:03:50 +01:00 |
|
Ramon Wenger
|
66ed01c1d7
|
Fix bug in objectives
|
2020-01-16 11:38:00 +01:00 |
|
Ramon Wenger
|
2192fea5a5
|
Enable GZip middleware on the server for leaner responses
|
2020-01-16 10:47:03 +01:00 |
|
Ramon Wenger
|
5f6817ebbe
|
Use slug to identify instruments on server
|
2020-01-16 09:48:38 +01:00 |
|
Ramon Wenger
|
ef6711965f
|
Optimize some queries to be easier on the database
|
2020-01-15 11:30:40 +01:00 |
|
Ramon Wenger
|
2b40f81764
|
Add bookmark actions to instrument, implement instrument bookmark
|
2020-01-08 15:00:40 +01:00 |
|
Ramon Wenger
|
c8a09badad
|
Add bookmarks to instruments on server side
|
2020-01-08 14:59:18 +01:00 |
|
Ramon Wenger
|
8765de9603
|
Add instrument query by id
|
2020-01-08 14:58:07 +01:00 |
|
Ramon Wenger
|
e45847fe1e
|
Fix unit tests
|
2019-12-19 09:46:55 +01:00 |
|
Ramon Wenger
|
9fb8e13c1c
|
Enable scrolling to the content blocks in a module
|
2019-12-18 16:28:24 +01:00 |
|
Ramon Wenger
|
1549cde151
|
Update MyActivity query to include more activities
|
2019-12-18 13:11:32 +01:00 |
|
Ramon Wenger
|
6f0cb0dd88
|
Add command for exporting assignments
|
2019-12-16 15:24:46 +01:00 |
|
Ramon Wenger
|
3081cb4cd2
|
Clean up migration conflicts
|
2019-12-10 15:30:23 +01:00 |
|
Ramon Wenger
|
388c1f63d7
|
Merged in feature/bookmarks-for-modules-and-chapters (pull request #42)
Feature/bookmarks for modules and chapters
|
2019-12-10 14:09:13 +00:00 |
|
Ramon Wenger
|
c2ead4c78d
|
Add cypress test
|
2019-12-09 15:18:47 +01:00 |
|
Christian Cueni
|
92d03dbe50
|
Merged in feature/feedback (pull request #41)
Feature/feedback
|
2019-12-09 10:04:27 +00:00 |
|
Ramon Wenger
|
93fb4c2612
|
Refactor code
|
2019-12-09 10:38:59 +01:00 |
|
Ramon Wenger
|
89e3925590
|
Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
|
2019-12-09 10:30:49 +01:00 |
|
Ramon Wenger
|
44ad1e6a8a
|
Add unit tests
|
2019-12-09 10:20:41 +01:00 |
|
Ramon Wenger
|
3f66ce5a0f
|
Add notes to chapters and modules
|
2019-12-05 14:39:50 +01:00 |
|
Ramon Wenger
|
f6f61aaf05
|
Add bookmark action for modules
|
2019-12-03 15:06:47 +01:00 |
|
Ramon Wenger
|
a06f32bcb0
|
Add bookmark action to chapter
|
2019-12-03 14:03:30 +01:00 |
|
Christian Cueni
|
84a69b24f1
|
Incoorperate feedback
|
2019-12-02 17:12:19 +01:00 |
|
Ramon Wenger
|
7c534cbe5c
|
Add first raw implementation for adtl. bookmark types
|
2019-12-02 13:56:52 +01:00 |
|
Christian Cueni
|
7641e5dcaa
|
Add logout button
|
2019-11-21 12:35:42 +01:00 |
|
Ramon Wenger
|
e7916215b0
|
Update import command to allow S3 resources as source
|
2019-11-20 15:05:35 +01:00 |
|
Christian Cueni
|
066f5259ce
|
Refactor submission form
|
2019-11-19 10:25:24 +01:00 |
|
Christian Cueni
|
a732074a9b
|
Add feedback in student view
|
2019-11-18 17:42:53 +01:00 |
|
Christian Cueni
|
662071d066
|
Handle form updates
|
2019-11-18 13:46:27 +01:00 |
|
Christian Cueni
|
a2af5759bb
|
Add emojis
|
2019-11-18 11:12:09 +01:00 |
|
Christian Cueni
|
d3a81e17d8
|
Add Feedback container component
|
2019-11-14 11:11:58 +01:00 |
|
Christian Cueni
|
f84efc7f1c
|
Add mutations and tests
|
2019-11-13 16:29:53 +01:00 |
|
Christian Cueni
|
add2c21815
|
Add feedback model, add migrations
|
2019-11-12 15:15:09 +01:00 |
|
Christian Cueni
|
e2f5c0b3f0
|
Fix copy, fix styles on server
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
193c1d39b5
|
Style no class page, change admin display
|
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
|
148b2cae3d
|
Init password reset after registration
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
436a9b891f
|
Add registration component
|
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
|
95d1c4708a
|
Merge branch 'develop' into feature/highlight-proof-of-concept
# Conflicts:
# client/src/components/ContentBlock.vue
|
2019-11-06 08:17:40 +01:00 |
|
Christian Cueni
|
81fb4f23cd
|
Change label for basic knowledge block
|
2019-11-05 10:40:19 +01:00 |
|
Christian Cueni
|
1352f68bae
|
Add topic to objective admin view
|
2019-11-05 10:31:31 +01:00 |
|
Ramon Wenger
|
02ddc4ecf4
|
Add AWS region setting
|
2019-10-24 15:04:01 +02:00 |
|
Ramon Wenger
|
6be09b55dd
|
Merge branch 'hotfix/aws-endpoint' into develop
|
2019-10-23 14:00:35 +02:00 |
|
Ramon Wenger
|
40dae4f2c0
|
Fix AWS endpoint URL
|
2019-10-23 13:59:30 +02:00 |