Commit Graph

500 Commits

Author SHA1 Message Date
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +01:00
Ramon Wenger 66ed01c1d7 Fix bug in objectives 2020-01-16 11:38:00 +01:00
Ramon Wenger 2192fea5a5 Enable GZip middleware on the server for leaner responses 2020-01-16 10:47:03 +01:00
Ramon Wenger 5f6817ebbe Use slug to identify instruments on server 2020-01-16 09:48:38 +01:00
Ramon Wenger ef6711965f Optimize some queries to be easier on the database 2020-01-15 11:30:40 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger c8a09badad Add bookmarks to instruments on server side 2020-01-08 14:59:18 +01:00
Ramon Wenger 8765de9603 Add instrument query by id 2020-01-08 14:58:07 +01:00
Ramon Wenger e45847fe1e Fix unit tests 2019-12-19 09:46:55 +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 6f0cb0dd88 Add command for exporting assignments 2019-12-16 15:24:46 +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 c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00
Christian Cueni 92d03dbe50 Merged in feature/feedback (pull request #41)
Feature/feedback
2019-12-09 10:04:27 +00:00
Ramon Wenger 93fb4c2612 Refactor code 2019-12-09 10:38:59 +01:00
Ramon Wenger 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
2019-12-09 10:30:49 +01:00
Ramon Wenger 44ad1e6a8a Add unit tests 2019-12-09 10:20:41 +01:00
Ramon Wenger 3f66ce5a0f Add notes to chapters and modules 2019-12-05 14:39:50 +01:00
Ramon Wenger f6f61aaf05 Add bookmark action for modules 2019-12-03 15:06:47 +01:00
Ramon Wenger a06f32bcb0 Add bookmark action to chapter 2019-12-03 14:03:30 +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 7641e5dcaa Add logout button 2019-11-21 12:35:42 +01:00
Ramon Wenger e7916215b0 Update import command to allow S3 resources as source 2019-11-20 15:05:35 +01:00
Christian Cueni 066f5259ce Refactor submission form 2019-11-19 10:25:24 +01:00
Christian Cueni a732074a9b Add feedback in student view 2019-11-18 17:42:53 +01:00
Christian Cueni 662071d066 Handle form updates 2019-11-18 13:46:27 +01:00
Christian Cueni a2af5759bb Add emojis 2019-11-18 11:12:09 +01:00
Christian Cueni d3a81e17d8 Add Feedback container component 2019-11-14 11:11:58 +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 e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
Christian Cueni 193c1d39b5 Style no class page, change admin display 2019-11-11 18:19:35 +01:00
Christian Cueni b20917d29a Validate license on login 2019-11-11 18:19:34 +01:00
Christian Cueni bceb01c5f4 Add and update tests, add dummy data 2019-11-11 18:19:34 +01:00
Christian Cueni 981b99ced7 Fix copy, fix mutation fields 2019-11-11 18:19:34 +01:00
Christian Cueni 148b2cae3d Init password reset after registration 2019-11-11 18:19:34 +01:00
Christian Cueni 436a9b891f Add registration component 2019-11-11 18:19:34 +01:00
Christian Cueni 80fce17efb Create class after regsitration 2019-11-11 18:19:34 +01:00
Christian Cueni 0b48607398 Add registration backend 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
Christian Cueni 81fb4f23cd Change label for basic knowledge block 2019-11-05 10:40:19 +01:00
Christian Cueni 1352f68bae Add topic to objective admin view 2019-11-05 10:31:31 +01:00
Ramon Wenger 02ddc4ecf4 Add AWS region setting 2019-10-24 15:04:01 +02:00
Ramon Wenger 6be09b55dd Merge branch 'hotfix/aws-endpoint' into develop 2019-10-23 14:00:35 +02:00
Ramon Wenger 40dae4f2c0 Fix AWS endpoint URL 2019-10-23 13:59:30 +02:00
Christian Cueni 38777cf914 Merged in feature/move-login (pull request #37)
Feature/move login

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-10-23 06:58:46 +00: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
Christian Cueni 0694471270 Fix test, cleanup 🛁 2019-10-08 13:41:09 +02:00
Christian Cueni 61161407b6 Fix & add api test 2019-10-08 10:44:45 +02:00
Christian Cueni c396c34be2 Hide registration, redirect to correct page after reset, style reset 2019-10-08 10:14:57 +02:00
Christian Cueni 80b1d38b93 Style public pages, add links to login page 2019-10-08 09:30:00 +02:00
Christian Cueni 13e3192776 Remove graphql password reset, style django pages 2019-10-08 09:30:00 +02:00
Christian Cueni 062269f030 Add loggedIn guard, add basic login component 2019-10-08 09:30:00 +02:00
Christian Cueni fb225b926d Add login tests 2019-10-08 09:30:00 +02:00
Christian Cueni 7e92753977 Add password reset tests 2019-10-08 09:30:00 +02:00
Christian Cueni 46518a22f8 Add password reset mutations 2019-10-08 09:30:00 +02:00
Christian Cueni 7d6a03743c Add login endpoint 2019-10-08 09:30:00 +02:00
Christian Cueni e982579711 Add public graphql endpoint 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 8045e01ffd Update naming to be more consistent 2019-09-12 14:28:57 +02:00
Ramon Wenger 9bb71512ed Update side name in admin 2019-09-11 14:24:53 +02:00
Ramon Wenger 4ae9c5813f Merged in feature/survey-with-correct-answer (pull request #34)
Feature/survey with correct answer

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-09-11 11:02:37 +00:00
Ramon Wenger 3fd9aa1f31 Add helper function 2019-09-11 11:41:34 +02:00
Ramon Wenger b2e133542c Fix cypress test 2019-09-09 16:00:35 +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 9e4784e5d8 Add helper functions to find the teacher of a user 2019-09-09 14:01:58 +02:00
Ramon Wenger 2efe682d7e Refactor dummy data 2019-09-05 14:44:46 +02:00
Ramon Wenger 75ba289100 Upate school class definion to not require a user when creating one 2019-09-04 16:12:15 +02:00
Ramon Wenger 4d2b354bc0 Add command for adding teachers 2019-09-04 16:08:41 +02:00
Ramon Wenger 695f6a016c Assign a role to students during import 2019-09-04 15:17:26 +02:00
Ramon Wenger 6020da8598 Add action menu and delete method to objectives 2019-08-26 11:15:25 +02:00
Ramon Wenger 6d5fa1806d Enable teachers to add new objectives instead of objective groups 2019-08-22 19:01:26 +02:00
Ramon Wenger 76b3f70a87 Hide single objectives instead of whole groups 2019-08-21 16:26:51 +02:00
Christian Cueni 3ae39cefce Handle missing attribute exception 2019-08-15 14:48:18 +02:00
Christian Cueni a81e211789 Fix nested modlue slug 2019-08-15 14:27:58 +02:00
Christian Cueni 1b47e5b837 Fix error when publishing page 2019-08-15 11:51:45 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8e0f9fd377 Support dicts in page update 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 c9df7354fb Replace old logo with new one 2019-07-31 13:39:17 +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 63b235de41 Add random password to imported users 2019-07-25 14:57:39 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Christian Cueni 0af01b4a48 Add mutation test 2019-07-25 11:43:51 +02:00
Christian Cueni 91967ceb21 Add mutations and query, fix popover 2019-07-25 11:43:51 +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 648a3e9229 Fix survey cypress test 2019-07-23 12:05:16 +02:00
Ramon Wenger f78a837bc0 Change more text 2019-07-22 11:48:40 +02:00
Ramon Wenger bc76882318 Add missing migrations 2019-07-22 11:33:41 +02:00