Commit Graph

811 Commits

Author SHA1 Message Date
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 dab5d907f3 Update mobile navigation styling 2019-12-10 14:11:14 +01:00
Ramon Wenger 84bcfdc7cf Add comments 2019-12-09 15:44:50 +01:00
Ramon Wenger d400b2f61c Add todo 2019-12-09 15:29:07 +01:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00
Ramon Wenger 3dc778d41b Fix cypress tests 2019-12-09 11:14:34 +01:00
Christian Cueni 92d03dbe50 Merged in feature/feedback (pull request #41)
Feature/feedback
2019-12-09 10:04:27 +00:00
Ramon Wenger 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
2019-12-09 10:30:49 +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
Ramon Wenger f7213b44e7 Always close the mobile navigation on router link click 2019-11-28 15:34:42 +01:00
Ramon Wenger 88bbd505f0 Add instruments to mobile subnavigation 2019-11-26 16:57:22 +01:00
Ramon Wenger 9e3a7d1607 Add topics to mobile navigation 2019-11-26 16:43:23 +01:00
Ramon Wenger 2913796a1b Add Thinglink block to frontend views 2019-11-26 09:31:39 +01:00
Christian Cueni 7641e5dcaa Add logout button 2019-11-21 12:35:42 +01:00
Ramon Wenger 42f888d0d6 Change bookmark icon color 2019-11-20 15:47:41 +01:00
Christian Cueni 735eae25e3 Handle submissions with no feedback 2019-11-19 15:32:13 +01:00
Christian Cueni 3e606073e2 Refactor emojis 2019-11-19 12:59:18 +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 d0b8ca7ac7 Style final an non-final feedbacks 2019-11-18 16:35:06 +01:00
Christian Cueni 714cb713b1 Style submission page 2019-11-18 15:31:42 +01:00
Christian Cueni 6bdce35f7f Style submissions page 2019-11-18 15:15:25 +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 6b739034de Refactor feedback form and final submission 2019-11-14 14:36:20 +01:00
Christian Cueni d3a81e17d8 Add Feedback container component 2019-11-14 11:11:58 +01:00
Christian Cueni ad07ada2f2 Add feedback to submission view, style view 2019-11-13 19:25:24 +01:00
Christian Cueni 4965eb5fa1 Add login link to registration 2019-11-12 10:49:09 +01:00
Christian Cueni d163f1b88a Comment test 2019-11-11 18:19:35 +01:00
Christian Cueni e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
Christian Cueni c84a87fc7f Keep cypress fail videos 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 06dbf20094 Add no-class page & guard 2019-11-11 18:19:34 +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 148b2cae3d Init password reset after registration 2019-11-11 18:19:34 +01:00
Christian Cueni 836cd63cfd Style inputs, make registration page public 2019-11-11 18:19:34 +01:00
Christian Cueni f3ae0fec7e Display server errors 2019-11-11 18:19:34 +01:00
Christian Cueni 436a9b891f Add registration component 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 a623a13c1d Hide bookmark actions for mobile 2019-11-05 11:04:29 +01:00
Christian Cueni 2d39ee8775 Hide bookmark actions in edit mode 2019-11-04 16:29:30 +01:00
Ramon Wenger 9b1c54cad2 Add optimistic update for the new note wizard 2019-10-28 15:21:06 +01:00
Ramon Wenger c346cfef3f Fix positioning of bookmark icons 2019-10-28 10:58:33 +01:00
Ramon Wenger 081f567334 Update content block optimistically 2019-10-24 16:22:41 +02:00
Ramon Wenger 91c278cae7 Remove module edit toggle from submissions page 2019-10-24 15:01:31 +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
Christian Cueni 81d89dae9a Change css names, refactor login guard 2019-10-23 08:33:37 +02:00
Ramon Wenger 1c2e0fc88b Add Thinglink block 2019-10-22 17:06:46 +02:00
Ramon Wenger 9b2db99d0b Make bookmarks work with content list blocks 2019-10-22 14:29:58 +02:00
Ramon Wenger d061116585 Add fixmes 2019-10-15 16:21:44 +02:00
Ramon Wenger 4fc896c224 Check for valid bookmark property 2019-10-15 13:47:02 +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 67cfc4b572 Add modal for adding notes 2019-10-10 09:50:27 +02:00
Ramon Wenger 95bc633cfb Fix unit test 2019-10-08 19:22:12 +02:00
Ramon Wenger 2656829d86 Add new bookmark component and some icons 2019-10-08 18:37:16 +02:00
Christian Cueni 2eae460b31 Fix integration test 2019-10-08 14:35:48 +02:00
Christian Cueni 0694471270 Fix test, cleanup 🛁 2019-10-08 13:41:09 +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 31de68e3d0 Use app logout 2019-10-08 09:30:00 +02:00
Christian Cueni e93dde272d Update tests 2019-10-08 09:30:00 +02:00
Christian Cueni 80b1d38b93 Style public pages, add links to login page 2019-10-08 09:30:00 +02:00
Christian Cueni a1954e00c5 Update integration tests 2019-10-08 09:30:00 +02:00
Christian Cueni 57224d228a Style default layout, style login 2019-10-08 09:30:00 +02:00
Christian Cueni 9783bd802a Redirect user to visited page after login 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
Ramon Wenger 5fd81a2bd6 Rename Highlight to Bookmark 2019-10-07 17:10:39 +02:00
Ramon Wenger 9837248881 Fix unit test 2019-10-02 14:57:52 +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 90598342b8 Move content block content handling to own component 2019-10-02 11:36:59 +02:00
Ramon Wenger 2c665399b6 Add survey save button text 2019-09-17 17:51:02 +02:00
Ramon Wenger 64bf100a19 Save user answers in surveys on page change 2019-09-17 10:12:28 +02:00
Ramon Wenger e940066db8 Display solutions for teachers always 2019-09-16 14:02:28 +02:00
Christian Cueni e551bdbdbd Merged in feature/fix-css-numbering (pull request #36)
Remove css numbering, use JS instead

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-09-12 14:34:09 +00:00
Christian Cueni 3a19f1a0b5 Remove css numbering, use JS instead 2019-09-12 10:35:49 +02:00
Ramon Wenger 23936ec6ae Fix bug where surveys don't retain answers without reloading 2019-09-12 09:08:16 +02:00
Christian Cueni 5c2ed30ccf Merged in feature/fix-numbering (pull request #35)
Fix content list numbering

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-09-11 14:01:35 +00:00
Christian Cueni 03f418df38 Fix content list numbering 2019-09-11 14:45:31 +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 b2e133542c Fix cypress test 2019-09-09 16:00:35 +02:00
Ramon Wenger 0a4269aaad Change news link to use SSL 2019-09-09 14:09:27 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 371c5cd276 Refactor code to be clearer 2019-09-09 11:07:45 +02:00
Ramon Wenger fd54e22430 Remove news subnavigation item 2019-09-06 15:55:38 +02:00
Ramon Wenger 8993f3f72b Add new news entry, re-enable news footer 2019-09-06 15:53:09 +02:00
Ramon Wenger 232e5246b4 Move objective border to the right spot 2019-09-06 15:46:39 +02:00
Ramon Wenger bddeeba74e Remove menu from user widget where not necessary 2019-09-06 15:42:13 +02:00
Ramon Wenger aeab246aee Add solutions to survey 2019-09-05 15:22:01 +02:00
Christian Cueni 2c5b49a4f2 Remove comment 2019-09-05 08:52:27 +02:00
Christian Cueni 117782a337 Add continuos numbering for content lists 2019-09-05 08:31:38 +02:00
Ramon Wenger 65663491b0 Add rudimentary answer display to survey page 2019-09-04 15:18:37 +02:00
Ramon Wenger fb671cbc2d Update cypress version 2019-09-04 15:17:56 +02:00
Ramon Wenger 0bcdcf9941 Merged in feature/objectives-by-class (pull request #32)
Feature/objectives by class
2019-08-26 13:12:34 +00:00
Christian Cueni a9de457e35 Add computed property for permission check 2019-08-26 14:49:05 +02:00