Commit Graph

303 Commits

Author SHA1 Message Date
Ramon Wenger ef4b1356ac Fix styling bug when editing a text block 2022-10-20 10:42:05 +02:00
Ramon Wenger 1149892735 Force infogram iFrame to resize 2022-09-29 14:09:20 +02:00
Ramon Wenger c23830ff40 Mark new technical debt with some todo comments 2022-09-15 16:16:25 +02:00
Ramon Wenger feef4f09b1 Style instruments dynamically
Resolves MS-479
2022-09-15 16:06:04 +02:00
Ramon Wenger 7fae655543 Add documents to client view 2022-09-08 12:28:37 +02:00
Ramon Wenger c27fc9200b Merged in release/mobile-improvements-july-2022 (pull request #116)
Release/mobile improvements july 2022

Approved-by: Lorenz Padberg
2022-08-29 10:42:55 +00:00
Lorenz Padberg 70ab28012b Fix jshint warning 2022-08-09 10:37:33 +02:00
Lorenz Padberg 21413b183a Merge branch 'feature/MS-540-use-custom-document-model' into release/Wagtail-anpassungen 2022-08-03 11:13:34 +02:00
Lorenz Padberg cc9efd216b Show display_text property in frontend 2022-08-02 15:54:03 +02:00
Lorenz Padberg a299ac5bcd Fix bottom spacing cms_document block and image_block 2022-07-28 16:31:13 +02:00
Lorenz Padberg dd57e9c4da Fix html classes in cms-document-block 2022-07-26 11:03:45 +02:00
Lorenz Padberg c679f84236 Add cms-document-block to api and frontend 2022-07-25 18:24:34 +02:00
Ramon Wenger 24d8d48a05 Fix assignment update function to not mutate an immutable property 2022-07-15 16:35:09 +02:00
Ramon Wenger 193614872d Update and rename test, hide assignment input on mobile
Relates to MS-534
2022-07-15 16:34:18 +02:00
Ramon Wenger bf850198f7 Display list items correctly in text blocks
Resolves MS-486
2022-07-11 15:36:36 +02:00
Ramon Wenger ff7e5ad1f6 Merged in feature/rooms-updated-edit-fields-MS-486-MS-487 (pull request #111)
Feature/rooms updated edit fields MS-486 MS 487

Approved-by: Lorenz Padberg
2022-07-11 13:26:51 +00:00
Ramon Wenger deb2a2cd1b Add test for subtitle in room entry, add missing block
Resolves MS-487
2022-07-06 11:00:22 +02:00
Ramon Wenger 9076eb462f Add styling for lists in assignments
Also, refactor some code

Relates to MS-518
2022-06-20 15:53:59 +02:00
Ramon Wenger 4ad31b4654 Update styling of new rich text assignments
Relates to MS-518
2022-06-20 15:41:12 +02:00
Ramon Wenger 5af06069e8 Allow html tags for survey solutions, add sanitizer
Resolves MS-500
2022-05-19 12:42:27 +02:00
Daniel Egger d7eaced895 Refactor from flavor mixin to ES6 module and plugin 2022-05-11 13:24:36 +02:00
Daniel Egger 77c355d569 MS-474: Add myKV-specific terms 2022-05-11 13:24:35 +02:00
Ramon Wenger 86591cd69b Change content block rendering of single list items, refactor code 2022-02-15 17:42:37 +01:00
Ramon Wenger 1112c6754e Add subtitle block to user content block form 2022-02-03 16:24:46 +01:00
Ramon Wenger b775d857a6 Update document block margin 2022-02-02 17:01:35 +01:00
Ramon Wenger 228def84b4 Fix styling bug in text element 2022-02-01 17:10:32 +01:00
Ramon Wenger 51fddbdf60 Move edit mode to local GraphQL property of module node 2022-01-31 18:24:03 +01:00
Ramon Wenger e1d3897e5e Clean up code, sanitize some inputs 2022-01-31 14:15:35 +01:00
Ramon Wenger 57704d7fc2 Refactor bookmark actions 2022-01-28 00:03:36 +01:00
Ramon Wenger 457c59cbc4 Clean up code 2022-01-26 20:49:31 +01:00
Ramon Wenger 7da98d9ae7 Clean up code 2022-01-26 20:04:51 +01:00
Ramon Wenger c4195916a7 Lint some more code 2022-01-19 11:56:20 +01:00
Ramon Wenger 50cb811f05 Refactor styling of nested content lists 2022-01-19 11:23:13 +01:00
Ramon Wenger bc0918876b Update usage of new component 2022-01-13 22:29:15 +01:00
Ramon Wenger 5b548e9d6a Refactor content component form 2022-01-13 22:03:42 +01:00
Ramon Wenger db35d407ca Refactor content list component 2022-01-13 10:44:09 +01:00
Ramon Wenger 40ab4243b8 Split code into more bandwidth-friendly chunks 2021-12-22 10:37:43 +01:00
Christian Cueni bb244d1f17 Style text in lists in solutions correctly 2021-11-29 12:55:36 +01:00
Christian Cueni b0aed1ca74 Add type to parent if missing 2021-11-16 11:55:57 +01:00
Ramon Wenger b4f11fa29b Add buttons to project entry form 2021-10-05 22:54:40 +02:00
Ramon Wenger df0f093b05 Add new emoji bar and some tests for it 2021-08-19 16:34:13 +02:00
Ramon Wenger a6c483c67c Update spell check cypress test 2021-08-03 17:32:12 +02:00
Ramon Wenger 26cda08d94 Add read only on a per school class basis to assignments 2021-07-30 17:54:46 +02:00
Ramon Wenger ecba2e3e3e Fix cypress tests 2021-07-08 15:49:18 +02:00
Ramon Wenger 1d66cc86be Fix naming 2021-07-07 16:02:12 +02:00
Ramon Wenger 949f656079 Make assignments read only in client 2021-07-05 13:14:03 +02:00
Ramon Wenger e4bb4cc9ee Add tests for read only assignments 2021-07-01 16:58:56 +02:00
Ramon Wenger f1db43a092 Turn instrument button into a link 2021-06-06 19:21:40 +02:00
Ramon Wenger 293bdd84ce Fix frontend tests 2021-05-17 14:17:10 +02:00
Ramon Wenger 3a64a11ea8 Refactor some file locations 2021-05-03 11:15:20 +02:00
Ramon Wenger 273d0dc74c Add bullet point styling to assignment solution 2021-03-15 22:54:11 +01:00
Ramon Wenger ff5b2d28f6 Prevent answers being deleted when opening a completed survey 2021-03-03 21:53:40 +01:00
Ramon Wenger 763b643186 Merge branch 'feature/whitelabel' into develop 2021-02-03 14:31:02 +01:00
Ramon Wenger 5eadff662d Disable bookmarking when editing a module 2021-01-26 17:29:12 +01:00
Ramon Wenger 173a954516 Enable spell check based on env variable 2021-01-21 16:41:11 +01:00
Ramon Wenger 1e53aceb04 Update more margins 2020-10-08 15:58:13 +02:00
Ramon Wenger fc279b94b0 Add more spacing to subtitles 2020-10-08 14:30:37 +02:00
Ramon Wenger 69e19591b3 Add component class to content component 2020-10-07 21:49:56 +02:00
Ramon Wenger 7fb61d9f05 Update spacing of various text elements 2020-10-07 15:54:40 +02:00
Ramon Wenger efd1c7e8f7 Force correct order and newlines for matrix solutions 2020-10-05 15:07:16 +02:00
Ramon Wenger 6360f1950a Add loading button component 2020-08-04 10:33:49 +02:00
Ramon Wenger 16c587ea59 Clean up semicolons 2020-08-03 14:35:25 +02:00
Ramon Wenger aad4f1f846 Fix Infogram resize bug 2020-05-26 15:06:16 +02:00
Ramon Wenger d6772bb3db Update linter rules and fix them 2020-05-25 14:19:12 +02:00
Ramon Wenger 6d5e66c469 Remove unused code 2020-05-07 12:25:41 +02:00
Ramon Wenger a799160501 Update icon 2020-04-14 15:53:59 +02:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger b13ca67d78 Fix section title block 2020-03-24 16:23:46 +01:00
Ramon Wenger 9c7e4c92ca Add margin bottom to infogram blocks 2020-03-11 11:13:15 +01:00
Ramon Wenger a59733b2f1 Add redirect after joining class 2020-02-24 16:23:55 +01:00
Ramon Wenger 919c0aec18 Add loading message for spellcheck 2020-02-12 10:37:34 +01:00
Ramon Wenger d11d494fae Clean up code 2020-02-06 15:06:50 +01:00
Ramon Wenger e8ada8f372 Add styling for spell check and teacher feedback 2020-02-03 15:11:01 +01:00
Ramon Wenger 6948c6724f Reset corrections on input and on turn in 2020-02-03 15:06:43 +01:00
Ramon Wenger ec1d68dd51 Add sentence offset to spell check results
Without that property, the offset always just starts at the current
sentence, not the whole user input
2020-02-03 15:04:52 +01:00
Ramon Wenger 2b9d14222d Fix order of corrections 2020-01-20 13:03:01 +01:00
Ramon Wenger 374186ed27 Re-add styling for highlights 2020-01-20 13:02:27 +01:00
Ramon Wenger cfde20c67c Add spell check component 2020-01-20 13:01:47 +01:00
Ramon Wenger 7f71977523 Add initial frontend implementation for spell checks 2020-01-20 13:01:00 +01:00
Ramon Wenger d4d2e9934e Add note to instruments 2020-01-16 10:45:36 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger a76b27bf0b Fix margin on link block in my activities 2019-12-19 11:37:31 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger b132e320af Fix scrolling to assignments 2019-12-18 13:18:17 +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
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 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 2913796a1b Add Thinglink block to frontend views 2019-11-26 09:31:39 +01:00
Christian Cueni 735eae25e3 Handle submissions with no feedback 2019-11-19 15:32:13 +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 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 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 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 081f567334 Update content block optimistically 2019-10-24 16:22:41 +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 2656829d86 Add new bookmark component and some icons 2019-10-08 18:37:16 +02:00
Ramon Wenger 5fd81a2bd6 Rename Highlight to Bookmark 2019-10-07 17:10:39 +02:00
Ramon Wenger 90598342b8 Move content block content handling to own component 2019-10-02 11:36:59 +02:00
Christian Cueni 3a19f1a0b5 Remove css numbering, use JS instead 2019-09-12 10:35:49 +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 aeab246aee Add solutions to survey 2019-09-05 15:22:01 +02:00
Christian Cueni 117782a337 Add continuos numbering for content lists 2019-09-05 08:31:38 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Ramon Wenger 9e118720b0 Add missing margins 2019-07-31 14:04:13 +02:00
Ramon Wenger 4eea9c3a2c Normalize line height for headings 2019-07-31 14:03:39 +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 7419ab72c4 Push that pixel 👨‍🎨 2019-07-17 11:49:32 +02:00
Christian Cueni 251c05abad Treat single content items as blocks 2019-07-16 11:45:00 +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 defce01a3f Remove log messages 2019-07-15 13:05:42 +02:00
Christian Cueni a41947e951 Add content list block component 2019-07-15 13:00:32 +02:00
Ramon Wenger 33a4f9e2c1 Merged in feature/new-assignment-design (pull request #21)
Feature/new assignment design

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-15 08:35:44 +00:00
Ramon Wenger b7e4d3eb53 Clean up code 2019-07-11 18:50:31 +02:00
Ramon Wenger c5fea80ab4 Add single button file upload 2019-07-11 16:19:06 +02:00
Christian Cueni e3c7cc77a9 Merged in feature/instruments (pull request #20)
Change default set for rich text, add blocks

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-11 12:25:20 +00:00
Ramon Wenger 6710f51b64 Adjust style of assignment input 2019-07-11 14:13:28 +02:00
Ramon Wenger d768087b2e Add auto grow directive to textarea 2019-07-11 13:55:39 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 2eb3fec0bb Use variables and mixins 2019-07-11 10:41:55 +02:00
Christian Cueni adbb6ca4d4 Fix margin 2019-07-11 10:41:55 +02:00
Christian Cueni ecba0d84bc Add subtitle to contentblock, style instrument widget 2019-07-11 10:41:55 +02:00
Christian Cueni 695a9a8ccb Change grayscale, add border 2019-07-11 10:41:55 +02:00
Christian Cueni 03d8ed6712 Add subtitle block, update font sizes 2019-07-11 10:41:55 +02:00
Christian Cueni d2dabd6952 Update font styles, change width 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 b29de0cf50 Fix assignment console bug 2019-05-21 11:18:57 +02:00
Ramon Wenger 28f96f8517 Force http on links 2019-05-09 09:18:21 +02:00
Christian Cueni 2051395e7b fix scrolling 2019-04-15 09:36:56 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 0a67c322be Add fullscreen image to ImageBlock 2019-03-13 16:33:57 +01:00
Ramon Wenger 18633d4de8 Remove full screen buttons 2019-03-01 11:23:24 +01:00
Ramon Wenger b86b1eea37 Replace more explicit values with variables 2019-02-27 16:52:55 +01:00
Ramon Wenger 42d07f8561 Replace explicit values with new variables 2019-02-27 16:19:51 +01:00
Ramon Wenger 170bfda78c Add genial.ly block to modal 2019-02-21 14:28:38 +01:00
Ramon Wenger 4f72f804c6 Add genial.ly block 2019-02-21 09:55:41 +01:00
Ramon Wenger 32f2ddaea5 Add full screen infographic component 2019-02-20 16:12:16 +01:00