 Ramon Wenger
|
c9222adf60
|
Update cypress tests to mock the server
|
2020-01-20 17:14:20 +01:00 |
Ramon Wenger
|
17e061892a
|
Fix assignment creation in dummy data
|
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
|
00b2b02113
|
Use slug to identify module when toggling solutions
|
2020-01-16 15:49:50 +01:00 |
|
Ramon Wenger
|
66ed01c1d7
|
Fix bug in objectives
|
2020-01-16 11:38:00 +01:00 |
|
Ramon Wenger
|
ef6711965f
|
Optimize some queries to be easier on the database
|
2020-01-15 11:30:40 +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
|
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 |
|
Ramon Wenger
|
ea7a306522
|
Add solution toggling to frontend
|
2019-02-07 16:58:20 +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
|
f235d50424
|
Add assignment as a snippet
|
2018-12-05 15:07:25 +01:00 |
|
Ramon Wenger
|
59efba9179
|
Filter content block by user created attribute
|
2018-12-04 13:32:11 +01:00 |
|
Ramon Wenger
|
876a22c4ad
|
Adjust test to run on pipelines
|
2018-11-20 09:13:37 +01:00 |
|
Ramon Wenger
|
d372905d7b
|
Restrict objective groups for students
|
2018-11-01 10:57:45 +01:00 |
|
Ramon Wenger
|
53f50bdc13
|
Add mutations for objective group visibility
|
2018-10-31 15:35:58 +01:00 |
|
Ramon Wenger
|
9b6207f192
|
Change title in objective group model
|
2018-10-30 23:31:54 +01:00 |
|
Ramon Wenger
|
e23dc4a9f0
|
Refactor code
|
2018-10-25 15:06:35 +02:00 |
|
Ramon Wenger
|
3ab8e9e8bb
|
Add migration
|
2018-10-25 13:56:19 +02:00 |
|
Ramon Wenger
|
106d90ed17
|
Add basic knowledge page to content block
|
2018-10-25 13:54:49 +02:00 |
|
Ramon Wenger
|
1cd31eb95a
|
Add basic knowledge model and admin
|
2018-10-25 11:05:59 +02:00 |
|
Christian Cueni
|
d80abf5b09
|
Prevent backend from changing a block’s type
|
2018-10-23 10:43:32 +02:00 |
|
Ramon Wenger
|
f16e4db625
|
Fix bug in room creation
|
2018-10-22 20:08:34 +02:00 |
|
Ramon Wenger
|
2e4255260b
|
Add hero image to module teasers
|
2018-10-19 10:57:07 +02:00 |
|
Ramon Wenger
|
febed9adc4
|
Fetch topic information from API
|
2018-10-19 10:36:31 +02:00 |
|
Ramon Wenger
|
181a06424a
|
Remove `filteredbook` app
|
2018-10-18 20:05:10 +02:00 |
|
Christian Cueni
|
7a2f8c91e4
|
Filter user created blocks based on classes
|
2018-10-18 16:59:28 +02:00 |
|
Ramon Wenger
|
90dac6b7e5
|
Merge branch 'feature/custom-assignments-to-user-created'
|
2018-10-18 16:30:43 +02:00 |
|
Ramon Wenger
|
9edbcf3d56
|
Add custom assignment test base
|
2018-10-18 16:28:06 +02:00 |
|
Ramon Wenger
|
b6f85183ae
|
Fix unit test
|
2018-10-18 14:46:22 +02:00 |
|
Ramon Wenger
|
5daeefbcec
|
Remove custom assignments, add `user created` flag
|
2018-10-18 10:02:02 +02:00 |
|
Ramon Wenger
|
13717c1371
|
Fix assignment creation
|
2018-10-18 10:00:03 +02:00 |
|
Ramon Wenger
|
543ce6a464
|
Fix unit tests
|
2018-10-17 15:53:46 +02:00 |
|
Ramon Wenger
|
7e88642918
|
Remove order property from module
|
2018-10-17 15:48:14 +02:00 |
|
Ramon Wenger
|
20ff1f8137
|
Fix migrations
|
2018-10-17 14:59:09 +02:00 |
|
Christian Cueni
|
13a9812ba0
|
Merged in feature/colors (pull request #3)
Feature/colors
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2018-10-17 12:34:16 +00:00 |
|
Christian Cueni
|
c6ca532633
|
fix tüpflischiiser
|
2018-10-17 13:19:01 +02:00 |
|
Christian Cueni
|
0adaedafb6
|
fix unit tests
|
2018-10-16 15:54:40 +02:00 |
|
Christian Cueni
|
d67f41f32b
|
remove logger
|
2018-10-16 15:32:16 +02:00 |
|
Christian Cueni
|
3547a30228
|
allow user to set block type
|
2018-10-16 07:29:41 +02:00 |
|
Ramon Wenger
|
0f5d9f80af
|
Remove school model, refactor code
|
2018-10-15 15:03:25 +02:00 |
|
Christian Cueni
|
a1a75e9b3f
|
rename types of Contentblocks, change box appearance
|
2018-10-15 14:10:24 +02:00 |
|
Ramon Wenger
|
e1deb19ca8
|
Re-do all migrations
|
2018-10-11 15:47:12 +02:00 |
|
Ramon Wenger
|
55683da3ed
|
Fix Unit Tests
|
2018-10-11 14:56:11 +02:00 |
|
Ramon Wenger
|
ce86e45743
|
Add content block deletion mutation
|
2018-10-11 11:39:50 +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 |
|
Ramon Wenger
|
8110ee359f
|
Distinguish between default and user created content blocks in cms admin
|
2018-10-09 17:42:19 +02:00 |
Daniel Egger
|
f3bcea7528
|
Refactored VisibilityPopover for new SchoolClass
|
2018-10-05 11:51:41 +02:00 |
|
Daniel Egger
|
d273d711c1
|
Renamed UserGroup to SchoolClass step 2
|
2018-10-05 11:25:05 +02:00 |
|
Daniel Egger
|
b2cac389cf
|
Renamed UserGroup to SchoolClass and reset migrations
|
2018-10-05 10:59:57 +02:00 |
|
Ramon Wenger
|
ba18946736
|
Fix tests
|
2018-10-04 15:57:56 +02:00 |
|
Ramon Wenger
|
b9bb41e8cc
|
Add module to assignment
|
2018-10-04 15:29:45 +02:00 |
|
Ramon Wenger
|
e524fe6107
|
Update factory to include image URL block generation
|
2018-10-04 13:51:18 +02:00 |
|
Daniel Egger
|
8811829e3a
|
Bugfix for Bitbucket-Pipelines tests
|
2018-10-04 12:52:56 +02:00 |
|
Daniel Egger
|
a5e58fb3fc
|
Added Authentication for GraphQL api endpoint. Added tests
|
2018-10-04 10:27:49 +02:00 |
|
Ramon Wenger
|
7a91d9ce77
|
Rename book to books and reset migrations
|
2018-10-04 10:05:14 +02:00 |