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
|
e9713c736b
|
Redirect to hello, add redirect query param
|
2020-02-18 16:32:12 +01:00 |
|
Christian Cueni
|
e067717d50
|
Fix local login
|
2020-02-18 16:01:20 +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 |
|
Christian Cueni
|
26a342c5a5
|
Fix license verification flow
|
2020-02-18 13:32:17 +01:00 |
 Ramon Wenger
|
879db2000b
|
Toggle the new sidebar
|
2020-02-17 16:14:48 +01:00 |
|
Christian Cueni
|
36c43bf4e1
|
Detect 402 in frontend, allow me query
|
2020-02-17 16:08:47 +01:00 |
|
Christian Cueni
|
82c1135f0e
|
Add coupon call in frontend, add tests, fix api
|
2020-02-13 10:03:00 +01:00 |
|
Ramon Wenger
|
76fa510053
|
Update local school class cache after joining a class
|
2020-02-12 20:28:46 +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
|
b36ba5f9a1
|
Add email verifcation page
|
2020-02-11 14:44:14 +01:00 |
|
Christian Cueni
|
a0eeec4e18
|
Add extra fields to registration, remove unused fields
|
2020-02-11 14:44:14 +01:00 |
|
Christian Cueni
|
587d661ca8
|
Add hello page, add local mutation
|
2020-02-11 14:42:58 +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
|
66842ac1d8
|
Add instruments to the my activity page
|
2020-02-05 11:35:04 +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
|
c9222adf60
|
Update cypress tests to mock the server
|
2020-01-20 17:14:20 +01:00 |
Ramon Wenger
|
bc9bf8cdec
|
Remove modules from manual cache definition
|
2020-01-20 13:03:01 +01:00 |
|
Ramon Wenger
|
7f71977523
|
Add initial frontend implementation for spell checks
|
2020-01-20 13:01:00 +01:00 |
|
Ramon Wenger
|
6c8628f56f
|
Prevent apollo client from throwing errors on 302 response
|
2020-01-20 10:38:29 +01:00 |
|
Ramon Wenger
|
8c908fddd2
|
Use slug to identify modules for the bookmark mutation
|
2020-01-16 15:03:50 +01:00 |
|
Ramon Wenger
|
5200d2165d
|
Use slug to identify instruments on client
|
2020-01-16 10:44:37 +01:00 |
|
Ramon Wenger
|
35cdd5ff5f
|
Remove superfluous query file
|
2020-01-13 19:48:46 +01:00 |
|
Ramon Wenger
|
2b40f81764
|
Add bookmark actions to instrument, implement instrument bookmark
|
2020-01-08 15:00:40 +01:00 |
|
Ramon Wenger
|
8765de9603
|
Add instrument query by id
|
2020-01-08 14:58:07 +01:00 |
|
Ramon Wenger
|
01ab01a9e9
|
Add instruments to local cache
|
2020-01-08 14:56:07 +01:00 |
|
Ramon Wenger
|
9fb8e13c1c
|
Enable scrolling to the content blocks in a module
|
2019-12-18 16:28:24 +01:00 |
|
Ramon Wenger
|
65a09fb9c7
|
Use the GQL cache for local state
|
2019-12-18 16:23:33 +01:00 |
|
Ramon Wenger
|
cb13aa1ea5
|
Update my activity in client
|
2019-12-18 13:17:08 +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
|
89e3925590
|
Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
|
2019-12-09 10:30:49 +01:00 |
|
Ramon Wenger
|
f6f61aaf05
|
Add bookmark action for modules
|
2019-12-03 15:06:47 +01:00 |
|
Ramon Wenger
|
7c534cbe5c
|
Add first raw implementation for adtl. bookmark types
|
2019-12-02 13:56:52 +01:00 |
|
Christian Cueni
|
735eae25e3
|
Handle submissions with no feedback
|
2019-11-19 15:32:13 +01:00 |
|
Christian Cueni
|
a732074a9b
|
Add feedback in student view
|
2019-11-18 17:42:53 +01:00 |
|
Christian Cueni
|
6bdce35f7f
|
Style submissions page
|
2019-11-18 15:15:25 +01:00 |
|
Christian Cueni
|
662071d066
|
Handle form updates
|
2019-11-18 13:46:27 +01:00 |
|
Christian Cueni
|
d3a81e17d8
|
Add Feedback container component
|
2019-11-14 11:11:58 +01:00 |
|
Christian Cueni
|
ad07ada2f2
|
Add feedback to submission view, style view
|
2019-11-13 19:25:24 +01:00 |
|
Christian Cueni
|
436a9b891f
|
Add registration component
|
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 |
|
Ramon Wenger
|
1d5603ed5f
|
Add note update mutation
|
2019-10-12 08:54:20 +02:00 |
|
Ramon Wenger
|
62460d58ab
|
Add node for notes
|
2019-10-12 08:52:23 +02:00 |
|
Ramon Wenger
|
67cfc4b572
|
Add modal for adding notes
|
2019-10-10 09:50:27 +02:00 |
|
Christian Cueni
|
062269f030
|
Add loggedIn guard, add basic login component
|
2019-10-08 09:30:00 +02:00 |
|
Ramon Wenger
|
5fd81a2bd6
|
Rename Highlight to Bookmark
|
2019-10-07 17:10:39 +02:00 |
|
Ramon Wenger
|
4247164067
|
Add highlight mutation
|
2019-10-02 11:39:40 +02:00 |
|
Ramon Wenger
|
584b48a6a6
|
Add notes app and a PoC for highlights
|
2019-10-02 11:38:53 +02:00 |
|
Ramon Wenger
|
e10b577ac1
|
Add solution visibility check to survey
|
2019-09-09 14:04:47 +02:00 |