ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
1,775 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

693 Commits

Author SHA1 Message Date
Ramon Wenger bdd3705bff Update styling, clean up code 2020-02-17 16:16:13 +01:00
Ramon Wenger 879db2000b Toggle the new sidebar 2020-02-17 16:14:48 +01:00
Ramon Wenger 08b816f3fd Add sidebar 2020-02-17 16:13:48 +01:00
Ramon Wenger 919c0aec18 Add loading message for spellcheck 2020-02-12 10:37:34 +01:00
Ramon Wenger 6688cedd7c Add initial cypress test for students to join classes 2020-02-10 15:42:22 +01:00
Ramon Wenger 12f3b2d9a7 Simplify the logic of visible content blocks for students 2020-02-10 09:27:43 +01:00
Ramon Wenger 542c7c6d84 Merged in feature/taskbase-spellcheck (pull request #45) 
Feature/taskbase spellcheck

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2020-02-06 14:16:40 +00:00
Ramon Wenger d11d494fae Clean up code 2020-02-06 15:06:50 +01:00
Ramon Wenger 2e4ac4d265 Add empty property to instrument activity 2020-02-05 14:00:25 +01:00
Ramon Wenger 66842ac1d8 Add instruments to the my activity page 2020-02-05 11:35:04 +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
Christian Cueni 113b1d8d9a Reset cache on logout, refactor logout 2020-01-22 08:43:01 +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 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +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 a75ae4f3fc Add top border to my activities 2019-12-19 14:19:42 +01:00
Ramon Wenger 32ae0b0641 Add filter for my activity 2019-12-19 14:19:20 +01:00
Ramon Wenger 74c74c1eca Add missing block type in my activities 2019-12-19 11:38:15 +01:00
Ramon Wenger 7237b86ac0 Refactor code 2019-12-19 11:38:07 +01:00
Ramon Wenger a76b27bf0b Fix margin on link block in my activities 2019-12-19 11:37:31 +01:00
Ramon Wenger de5882f644 Add anchor for notes 2019-12-19 11:36:29 +01:00
Ramon Wenger ddf3bde076 Add clickable link to my activities 2019-12-19 11:34:20 +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 cb13aa1ea5 Update my activity in client 2019-12-18 13:17:08 +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 dab5d907f3 Update mobile navigation styling 2019-12-10 14:11:14 +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
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 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 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 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 31de68e3d0 Use app logout 2019-10-08 09:30:00 +02:00
Christian Cueni 57224d228a Style default layout, style login 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 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
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 fd54e22430 Remove news subnavigation item 2019-09-06 15:55:38 +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
Christian Cueni a9de457e35 Add computed property for permission check 2019-08-26 14:49:05 +02:00
Ramon Wenger 046599af81 Hide hidden objectives when not in edit mode 2019-08-26 11:25:46 +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 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8c42daca7f Update copy, fix widget height 2019-08-13 11:25:38 +02:00
Christian Cueni 4ecb7a8c2b Use assignments from chapters for list generation 2019-08-13 09:15:37 +02:00
Ramon Wenger cb76318601 Re-add solution toggle to module navigation bar 2019-07-31 17:11:15 +02:00
Ramon Wenger 99c39b1b69 Update and normalize meta title style 2019-07-31 15:31:27 +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 46474db70d Fix content block delete bug 2019-07-31 10:36:38 +02:00
Ramon Wenger 5e2ddf69b8 Fix filter on assignments with submissions page 
Student submissions were not displayed because of a wrong filter. They
are now displayed again.
 2019-07-29 15:26:57 +02:00
Ramon Wenger 0b0942ba4b Display the assignment text, not the title for assignment submission 
page
 2019-07-29 11:28:21 +02:00
Ramon Wenger 5ae47029a3 Hide content blocks for teachers when not in edit mode 2019-07-29 11:09:51 +02:00
Ramon Wenger 4483175dbe Hide module subnavigation for students 2019-07-29 10:53:31 +02:00
Ramon Wenger fae0043138 Only display edit actions for content block when edit mode is on 2019-07-29 10:34:12 +02:00
Ramon Wenger 981302192c Fix content block bug 2019-07-29 09:40:12 +02:00
Ramon Wenger 04cfa18853 Add user widget to custom content blocks 2019-07-25 17:05:59 +02:00
Ramon Wenger d93ffe1534 Add actions for custom content blocks 2019-07-25 16:57:59 +02:00
Christian Cueni deabbf328f Use UserMetaWidget 2019-07-25 11:43:51 +02:00
Christian Cueni 780602dfd2 Add option for mobile 2019-07-25 11:43:51 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 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
Christian Cueni 90b919c839 Add class selection widget 2019-07-25 11:43:51 +02:00
Christian Cueni ea9822562a Use popover in user widget 2019-07-25 11:43:51 +02:00
Ramon Wenger 18b6079d26 Merged in feature/content-actions (pull request #29) 
Feature/content actions

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2019-07-25 08:15:02 +00:00
Ramon Wenger 0c2cc090e2 Add comment to unreadable code block 2019-07-25 09:52:26 +02:00
Ramon Wenger b2ae3dce23 Add style to subnavigation 2019-07-24 15:32:11 +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 a34313932f Add lead paragraph styling to chapter description 2019-07-24 11:38:47 +02:00
Ramon Wenger 185cd4a81e Remove visibility popover, add eye icon button 2019-07-24 11:28:46 +02:00
Ramon Wenger c479d0f2bf Only show module edit checkbox for teacher 2019-07-24 11:19:39 +02:00
Ramon Wenger 824e5b9357 Remove obsolete content block action icons 2019-07-24 10:29:02 +02:00
Ramon Wenger a4cf7a0d62 Add toggle for module editing 2019-07-23 16:04:23 +02:00
Ramon Wenger 8bd6d51028 Add new SVGs for icons 2019-07-23 15:59:53 +02:00
Ramon Wenger e422d29759 Fix position of top filter 2019-07-23 14:26:05 +02:00
Ramon Wenger 48ee15850f Merged in feature/old-surveyjs-styling (pull request #27) 
Feature/old surveyjs styling

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2019-07-23 08:33:37 +00:00
Christian Cueni 81315e9848 Hide filters 2019-07-18 15:36:16 +02:00
Ramon Wenger a9b10fdf88 Add radiobutton styling to survey 2019-07-18 14:55:46 +02:00
Ramon Wenger dd1bf56f49 Fix subnavigation styling 2019-07-18 10:20:52 +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
Christian Cueni 7419ab72c4 Push that pixel 👨‍🎨 2019-07-17 11:49:32 +02:00
Christian Cueni 599344e4be Augment fields in content list item 2019-07-17 11:33:20 +02:00
Ramon Wenger 12b580a94a Hide subnavigation on navigation 2019-07-17 11:26:33 +02:00
Ramon Wenger dae832b98d Add navigation to and from instrument overview 2019-07-17 11:20:01 +02:00
Ramon Wenger bd17543ec2 Add teaser helper function 2019-07-17 09:54:34 +02:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Ramon Wenger d788466942 Rename some components 2019-07-16 16:12:04 +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 8f0e0f9fe7 Hide nested content's title 2019-07-15 14:13:10 +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
Ramon Wenger 0ef9298c19 Refactor code 2019-07-11 10:41:55 +02:00
Ramon Wenger e1936a33b1 Rename constant 2019-07-11 10:41:55 +02:00
Christian Cueni 9df8ef6423 Change title markup 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 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +02:00
Ramon Wenger db4353faa1 Remove second objective groups block 2019-06-26 09:39:31 +02:00
Ramon Wenger 03623fbcc6 Remove header 2019-06-25 18:06:24 +02:00
Ramon Wenger 43da8adfa4 Change default topic 2019-06-24 16:07:42 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger 590fd180c3 Move project and room actions to own component 
Also adds those actions to the detail pages of both entity types. Also refactors some code.
 2019-05-22 17:47:31 +02:00
Ramon Wenger c7cf6f7863 Add document name to room entry preview 2019-05-21 14:49:13 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger b29de0cf50 Fix assignment console bug 2019-05-21 11:18:57 +02:00
Ramon Wenger 8764aee445 Add icon to document form 2019-05-15 15:34:32 +02:00
Ramon Wenger caa6736330 Handle document upload in image form 2019-05-15 15:14:32 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Ramon Wenger dda9f75011 Disable task content block creation for students 2019-05-09 10:20:26 +02:00
Ramon Wenger 28f96f8517 Force http on links 2019-05-09 09:18:21 +02:00
Ramon Wenger 545f3adb41 Fix wording 2019-05-09 09:13:01 +02:00
Ramon Wenger c8f02ec6b2 Fix room entry widget height 2019-05-09 09:12:42 +02:00
Ramon Wenger bd1286abba Prevent double saving on entity creation 2019-05-08 14:42:58 +02:00
Ramon Wenger e88b9a07db Hide assignment block type on room entry form 2019-05-07 15:50:19 +02:00
Ramon Wenger a0b49a752b Display documents in projects in a more useful manner 2019-05-07 15:27:21 +02:00
Ramon Wenger 96ffc7f484 Fix typos 2019-04-25 12:01:00 +02:00
Christian Cueni ed38e73f5b Merged in feature/profile-image (pull request #16) 
Feature/profile image

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-04-25 09:23:37 +00:00
Christian Cueni 4688a29122 Clean up code 2019-04-25 10:57:13 +02:00
Christian Cueni 1da5c4bb29 Use background image instead of img 2019-04-24 17:06:11 +02:00
Christian Cueni 979b732583 Move profile link to parent elements 2019-04-24 14:50:00 +02:00
Christian Cueni aca8bd0d2d Add possibility to upload avatars 2019-04-24 14:23:54 +02:00
Ramon Wenger d7a3dd74c2 Add document upload to project entry 2019-04-24 10:41:27 +02:00
Christian Cueni 6b0a2e0d59 update text 2019-04-16 14:25:14 +02:00
Christian Cueni e9bb8844e7 update hamburger icon 2019-04-16 08:33:20 +02:00
Christian Cueni d7cd5d2809 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2019-04-16 08:22:39 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Ramon Wenger 83721de7ea Fix cypress test 2019-04-15 12:56:55 +02:00
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 807005e164 truncate activity text 2019-04-15 10:29:24 +02:00
Christian Cueni 2051395e7b fix scrolling 2019-04-15 09:36:56 +02:00
Ramon Wenger 67370f7b4f Fix some more IE11 issues 2019-04-14 21:09:56 +02:00
Ramon Wenger d7b9fa0106 Make tooltip wrappable 2019-04-11 17:03:06 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 0fd1e928ae Add tooltip for help text 2019-04-11 16:47:46 +02:00