Commit Graph

303 Commits

Author SHA1 Message Date
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
Ramon Wenger a50f3737a6 Add full screen modal for images 2019-02-20 10:57:17 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 2452494b33 Add solution to assignment in content block 2019-02-13 16:21:18 +01:00
Ramon Wenger 4c5a786e7d Fix margin after solution 2019-02-13 16:19:29 +01:00
Ramon Wenger 47761c11c0 Update rendering of solutions 2019-02-05 18:51:41 +01:00
Ramon Wenger 07785ae2c1 Add transition to solutions 2019-02-04 18:54:55 +01:00
Ramon Wenger a08be83283 Add styling to solution 2019-02-04 18:09:51 +01:00
Ramon Wenger 5ce09a4e13 Add solution block to client (including cypress test) 2019-02-04 15:19:58 +01:00
Ramon Wenger 0080dfe0d7 Fix continuous input bug 2018-12-04 13:24:36 +01:00
Ramon Wenger 6387024f81 Add SRF video embedding 2018-11-14 11:53:28 +01:00
Ramon Wenger a51a882c1d Update styling 2018-11-01 16:01:13 +01:00
Ramon Wenger 7c3d19170d Add newlines to student submissions 2018-10-25 16:52:55 +02:00
Ramon Wenger 0aec11dd76 Clean up code 2018-10-25 16:03:42 +02:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger 6591958546 Add assignment result link for teacher view 2018-10-25 15:24:48 +02:00
Ramon Wenger 96cbb70477 Remove unused code 2018-10-25 14:34:17 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger 365002f800 Fix assignment submission bug on navigation 2018-10-24 16:49:33 +02:00
Christian Cueni 2d52a5b13d Fix broken css expression 2018-10-22 13:56:23 +02:00
Christian Cueni 3547a30228 allow user to set block type 2018-10-16 07:29:41 +02:00
Christian Cueni a1a75e9b3f rename types of Contentblocks, change box appearance 2018-10-15 14:10:24 +02:00
Ramon Wenger 72cab13b36 Add default users 2018-10-15 13:54:34 +02:00
Ramon Wenger 6772aba1c9 Make image blocks work 2018-10-11 16:07:02 +02:00
Ramon Wenger e72668402f Clean up client code 2018-10-04 13:51:49 +02:00
Daniel Egger 465fc9f3ed fix css problem 2018-10-03 11:45:17 +02:00
Ramon Wenger 10ce0059ca Replace loading icon 2018-10-03 11:33:58 +02:00
Daniel Egger c688aae30c FinalSubmission zeigt auch Dokument an 2018-10-03 09:49:54 +02:00
Daniel Egger b0df2aad01 user can delete submitted document 2018-10-03 09:38:45 +02:00
Daniel Egger 00255ea28c first version working document upload in assignment 2018-10-02 18:04:08 +02:00
Daniel Egger 8420d8aab1 upload documents in user assignment 2018-10-02 18:04:08 +02:00
Daniel Egger 329c068d80 nur namen vom file anzeigen 2018-10-02 18:04:08 +02:00
Ramon Wenger 39f542c638 Add word wrap 2018-10-02 17:11:39 +02:00
Ramon Wenger c1154f5e3a Add animation when saving a submission
The correct icon is missing, needs to be delivered yet.
2018-10-02 17:08:36 +02:00
Ramon Wenger 9226f44db6 Update styling on tasks and assignments 2018-10-02 16:14:05 +02:00
Ramon Wenger 95f2e348f1 Update submission on assignment component
Update the data on the parent component to prevent inconsistent data on the server
2018-10-02 15:01:43 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +02:00
Ramon Wenger b22b918d82 Add final submission for assignment 2018-10-02 13:16:50 +02:00
Ramon Wenger f4fb15e428 Refactor folder structure 2018-10-02 13:16:01 +02:00
Ramon Wenger 091b5b4d39 Update assignment widget styling 2018-10-02 11:24:12 +02:00
Ramon Wenger ea9fa06634 Add assignment queries and mutation to client 2018-10-02 10:08:59 +02:00
Ramon Wenger 7feff2f178 Remove dropzone 2018-09-28 16:39:14 +02:00
Ramon Wenger 70c6b4329b Update assignment component naming 2018-09-27 22:40:16 +02:00
Daniel Egger b8b09b1af3 example with uploadcare 2018-09-19 16:37:27 +02:00
Ramon Wenger 639fa7665c Add document block 2018-09-12 15:05:36 +02:00
Ramon Wenger 23f282b358 Add link block 2018-09-12 14:37:28 +02:00
Ramon Wenger 4010b21cce Add video block to frontend and backend 2018-09-12 10:27:40 +02:00
Ramon Wenger f7d15b35d6 Refactor icon folder location 2018-09-05 16:09:29 +02:00
Ramon Wenger 333f68b04d Add icon to tasks 2018-08-27 16:45:08 +02:00
Ramon Wenger e92927132c Add basic knowledge page 2018-08-23 12:23:21 +02:00
Ramon Wenger 673e05d6a6 Adjust styles to be more consistent 2018-08-23 11:22:22 +02:00
Pawel Kowalski de14c02f0a Add ModalText to get rid of console errors 2018-08-18 00:14:17 +02:00
Ramon Wenger 08527a7575 Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-16 16:32:06 +02:00
Pawel Kowalski a512ef4f63 Move content blocks into content-blocks directory 2018-08-16 16:13:05 +02:00