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
|
1c2e0fc88b
|
Add Thinglink block
|
2019-10-22 17:06:46 +02:00 |
|
Ramon Wenger
|
5fd81a2bd6
|
Rename Highlight to Bookmark
|
2019-10-07 17:10:39 +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
|
2af5749311
|
Add module reference to survey
|
2019-09-09 14:03:04 +02:00 |
|
Christian Cueni
|
2fa006d790
|
Rename block, update frontend
|
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
|
c81bcbd26b
|
Add survey block to content block in back- and frontend
|
2019-07-24 14:23:27 +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
|
03d8ed6712
|
Add subtitle block, update font sizes
|
2019-07-11 10:41:55 +02:00 |
|
Ramon Wenger
|
bad289ac3a
|
Rename basic knowledge to instrument in frontend
|
2019-06-24 15:54:38 +02: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
|
4b93b410a5
|
Add mutation to enable solutions by module
|
2019-02-05 18:45:03 +01:00 |
|
Ramon Wenger
|
92d2901f9e
|
Add solution type to server
|
2019-02-04 15:19:27 +01:00 |
|
Ramon Wenger
|
e23dc4a9f0
|
Refactor code
|
2018-10-25 15:06:35 +02:00 |
|
Christian Cueni
|
a1a75e9b3f
|
rename types of Contentblocks, change box appearance
|
2018-10-15 14:10:24 +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 |
|
Ramon Wenger
|
8110ee359f
|
Distinguish between default and user created content blocks in cms admin
|
2018-10-09 17:42:19 +02:00 |
Daniel Egger
|
b2cac389cf
|
Renamed UserGroup to SchoolClass and reset migrations
|
2018-10-05 10:59:57 +02:00 |
|
Ramon Wenger
|
7a91d9ce77
|
Rename book to books and reset migrations
|
2018-10-04 10:05:14 +02:00 |