Ramon Wenger
|
1549cde151
|
Update MyActivity query to include more activities
|
2019-12-18 13:11:32 +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
|
44ad1e6a8a
|
Add unit tests
|
2019-12-09 10:20:41 +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
|
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
|
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 |
|
Ramon Wenger
|
1c2e0fc88b
|
Add Thinglink block
|
2019-10-22 17:06:46 +02: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
|
a8a6abb2d8
|
Add model and mutation for adding notes
|
2019-10-10 09:48:38 +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
|
8045e01ffd
|
Update naming to be more consistent
|
2019-09-12 14:28:57 +02:00 |
|
Ramon Wenger
|
3fd9aa1f31
|
Add helper function
|
2019-09-11 11:41:34 +02:00 |
|
Ramon Wenger
|
b1a87cb08b
|
Fix unit tests
|
2019-09-09 15:34:13 +02:00 |
|
Ramon Wenger
|
e10b577ac1
|
Add solution visibility check to survey
|
2019-09-09 14:04:47 +02:00 |
|
Ramon Wenger
|
2af5749311
|
Add module reference to survey
|
2019-09-09 14:03:04 +02:00 |
|
Ramon Wenger
|
76b3f70a87
|
Hide single objectives instead of whole groups
|
2019-08-21 16:26:51 +02:00 |
|
Christian Cueni
|
a81e211789
|
Fix nested modlue slug
|
2019-08-15 14:27:58 +02:00 |
|
Christian Cueni
|
2fa006d790
|
Rename block, update frontend
|
2019-08-14 11:52:44 +02:00 |
|
Christian Cueni
|
b0ae5a7cf1
|
Use titleslug model for admin slug
|
2019-08-14 11:52:44 +02:00 |
|
Christian Cueni
|
083a8b03a8
|
Add admin slug model
|
2019-08-14 11:52:44 +02:00 |
|
Ramon Wenger
|
bdfd6ee510
|
Change the content block type only if the user specifies a type
|
2019-07-29 11:22:00 +02:00 |
|
Ramon Wenger
|
c81bcbd26b
|
Add survey block to content block in back- and frontend
|
2019-07-24 14:23:27 +02:00 |
|
Ramon Wenger
|
bc76882318
|
Add missing migrations
|
2019-07-22 11:33:41 +02:00 |
|
Christian Cueni
|
a1234f6688
|
Merged in feature/nested-block (pull request #26)
Feature/nested block
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-07-17 15:14:57 +00:00 |
|
Ramon Wenger
|
98a8acac4f
|
Refactor subnavigation and implement module subnavigation
|
2019-07-16 16:15:20 +02:00 |
|
Christian Cueni
|
2905486c2f
|
Remove content list in wagtail, add content list in frontend
|
2019-07-16 09:36:43 +02:00 |
|
Christian Cueni
|
036c53dd9f
|
Add content list block
|
2019-07-15 12:59:00 +02:00 |
|
Christian Cueni
|
fd4a9d2e18
|
Add content list
|
2019-07-15 12:56:47 +02:00 |
|
Christian Cueni
|
707909761e
|
Change default set for rich text, add blocks
|
2019-07-11 10:49:54 +02:00 |
|
Christian Cueni
|
03d8ed6712
|
Add subtitle block, update font sizes
|
2019-07-11 10:41:55 +02:00 |
|
Ramon Wenger
|
4696ed239e
|
Remove required description on instrument block
|
2019-06-24 16:12:31 +02:00 |
|
Ramon Wenger
|
bad289ac3a
|
Rename basic knowledge to instrument in frontend
|
2019-06-24 15:54:38 +02:00 |
|
Ramon Wenger
|
016f6ce502
|
Enable editing of content blocks with assignments
|
2019-05-21 15:15:38 +02:00 |
|
Christian Cueni
|
40a0c3ecbe
|
Merge branch 'feature/pw-reset' into develop
|
2019-04-15 10:31:14 +02:00 |
|
Christian Cueni
|
59d88d5143
|
use activity data in frontent
|
2019-04-11 17:00:59 +02:00 |
|
Ramon Wenger
|
6853cc8734
|
Update last module in a mutation instead of the query
|
2019-04-11 14:15:36 +02:00 |
|
Ramon Wenger
|
34ad9927a7
|
Fix unit tests
|
2019-03-12 14:06:47 +01:00 |
|
Ramon Wenger
|
117e8bf0d8
|
Add vimeo video to topic
|
2019-03-11 19:45:28 +01:00 |
|
Ramon Wenger
|
10b35a5a3e
|
Add last visited module to user
|
2019-03-01 11:19:43 +01:00 |
|
Ramon Wenger
|
4f72f804c6
|
Add genial.ly block
|
2019-02-21 09:55:41 +01:00 |
|
Ramon Wenger
|
836dbd2bbb
|
Add Infogram block
|
2019-02-18 16:59:47 +01:00 |
|
Ramon Wenger
|
e7d1acbb5c
|
Display solutions for admins
|
2019-02-13 16:34:39 +01:00 |
|
Ramon Wenger
|
0b75e14393
|
Move solution check to utils
|
2019-02-13 16:20:29 +01:00 |