Commit Graph

118 Commits

Author SHA1 Message Date
Ramon Wenger 7ef761cf58 Generate missing migrations 2020-05-26 16:05:21 +02:00
Ramon Wenger 09153782d5 Fix dummy data 2020-05-26 11:19:06 +02:00
Ramon Wenger cd2e5c953e Update instrument dummy data 2020-05-07 12:22:43 +02:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger 8774b8d324 Add instructions property to topic model 2020-04-10 21:24:15 +02:00
Ramon Wenger dc66293684 Add interdisciplinary instrument 2020-04-08 10:50:06 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger 6205846b80 Clean up code, change some minor things 2020-03-10 11:40:24 +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
Ramon Wenger 12f3b2d9a7 Simplify the logic of visible content blocks for students 2020-02-10 09:27:43 +01:00
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