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

810 Commits

Author SHA1 Message Date
Christian Cueni d7b977ba06 Merged in feature/jest-tests (pull request #31) 
Feature/jest tests

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-08-26 11:32:15 +00:00
Christian Cueni a4d19cbfe6 Fix typo 2019-08-26 13:19:32 +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 29a0ec5aef Hide news 2019-08-14 13:31:21 +02:00
Christian Cueni c2985d663a Make layout styles scoped 2019-08-14 11:52:44 +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 3918d170f9 Add jest to all tests 2019-08-13 11:10:01 +02:00
Christian Cueni 8f1ee79347 Add jest tests 2019-08-13 10:57:11 +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 5bdf5d53ee Update survey styling 2019-07-31 16:00:16 +02:00
Ramon Wenger 4d300e92eb Add custom style for dropdowns 2019-07-31 15:33:00 +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 c577cc6c1a Update survey styling for 'completed' page 2019-07-31 10:59:30 +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 b19419af69 Normalize heading font size in survey panels 2019-07-25 11:12:24 +02:00
Ramon Wenger ee89522b99 Update panel styling in surveys 2019-07-25 10:54:18 +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 fa72d8f5b8 Add button to reopen survey 2019-07-24 15:22:53 +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 648a3e9229 Fix survey cypress test 2019-07-23 12:05:16 +02:00
Christian Cueni 162b988998 Skip solution test 2019-07-23 11:32:46 +02:00
Ramon Wenger 062d799c4c Set locale on survey 2019-07-23 11:14:02 +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
Ramon Wenger c537fd37aa Add more styling 2019-07-22 16:27:59 +02:00
Ramon Wenger d8f4077d63 Fix typo 2019-07-22 14:42:07 +02:00
Ramon Wenger eda5653477 Always display survey title from JSON, never from model 2019-07-22 11:36:08 +02:00
Ramon Wenger 3a64365f7d Replace values with a variable 2019-07-18 16:33:21 +02:00
Christian Cueni 81315e9848 Hide filters 2019-07-18 15:36:16 +02:00
Ramon Wenger b84059adf5 Add checkbox styling 2019-07-18 15:13:58 +02:00
Ramon Wenger d5a63a0c7e Add styling for survey progress bar 2019-07-18 15:01:55 +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 cc55dbdf69 Fix subtitle and genially blocks in instruments 2019-07-17 15:11:43 +02: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 cd6ff31cef Add instrument query to instrument overview 2019-07-17 09:54:34 +02:00
Ramon Wenger 2a4cf56825 Refactor some more occurences of basic knowledge to instrument 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
Ramon Wenger 3820256872 Fix css bug 2019-07-15 18:18:42 +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 7339e72c1e Fix html 2019-07-11 10:46:04 +02:00
Christian Cueni 7bdeb4b6f5 Add import 2019-07-11 10:43:04 +02:00
Christian Cueni 1f72d4757f Change boldest font weight 2019-07-11 10:42:33 +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 ca17ed42f7 Add property check to answer 2019-07-08 16:03:55 +02:00
Ramon Wenger a09bf2786d Save correct answer with answer given by user 2019-07-08 15:10:33 +02:00
Ramon Wenger 9dca627465 Merged in feature/surveyjs (pull request #17) 
Feature/surveyjs
 2019-07-04 11:31:12 +00:00
Ramon Wenger e296d500aa Clean up code 2019-07-04 10:24:12 +02:00
Ramon Wenger 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +02:00
Ramon Wenger b498dc4efa Add cypress test for surveys 2019-07-01 13:08:42 +02:00
Ramon Wenger fbe39e2784 Add style guide 2019-06-27 17:56:49 +02:00
Ramon Wenger 9b85560795 Add answers to surveys 2019-06-27 17:56:29 +02:00
Ramon Wenger f9642ff49e Get survey from server and display it dynamically 2019-06-27 17:55:07 +02:00
Ramon Wenger d8e3d24f4a Fix background color bug 2019-06-26 13:59:00 +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 2494245b12 Add survey.js demo implementation to frontend 2019-06-20 14:51:09 +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 7bc8c3c3aa Add cypress test for project entry deletion 2019-05-21 14:42:06 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger d5364d8d9d Re-add intro to module 2019-05-21 14:08:30 +02:00
Ramon Wenger b29de0cf50 Fix assignment console bug 2019-05-21 11:18:57 +02:00
Ramon Wenger 5432e4c8df Fix scrolling issue 2019-05-21 11:18:27 +02:00
Ramon Wenger 78e2e3ecc5 Add polling to rooms and portfolio pages 2019-05-15 18:21:04 +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 1417f8fc2d Add long polling to room and project 2019-05-14 17:17:24 +02:00
Ramon Wenger a5b05c5faa Add refresh on room page 2019-05-14 09:53:49 +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
Christian Cueni 6513da19cf Fix url in cypress test 2019-04-25 12:41:19 +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
Ramon Wenger 244f7405f6 Fix portfolio on mobile 2019-04-23 16:38:24 +02:00
Christian Cueni 6b0a2e0d59 update text 2019-04-16 14:25:14 +02:00
Christian Cueni f869b0141f show add entry button only to owner, don’t allow project entries from other users 2019-04-16 12:48:54 +02:00
Christian Cueni 69c9ecafd8 fix white background in projects, add screenshots to gitignore 2019-04-16 11:16:27 +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
Ramon Wenger e525e0d3de Add correct color to portfolio project page 2019-04-11 14:31:09 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +02:00
Ramon Wenger 09d20e346d Add test for current module 2019-04-11 14:15:36 +02:00
Christian Cueni f8c1f372cb merge develop into feature/pw-reset 2019-04-11 08:14:08 +02:00
Christian Cueni f51924330c add new components with dummy data 2019-04-10 15:50:14 +02:00
Christian Cueni aca36b8a66 resolve conflicts 2019-04-10 09:37:42 +02:00
Christian Cueni 42c579b047 use me query, add components 2019-04-09 16:24:05 +02:00
Ramon Wenger 78bc046462 Add back button on submissions page 2019-04-09 14:50:16 +02:00
Ramon Wenger 26981f3125 Fix cypress test 2019-04-09 14:37:21 +02:00
Ramon Wenger 8a57e7ae48 Merged in feature/mobile-navigation (pull request #14) 
Feature/mobile navigation

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2019-04-09 10:58:07 +00:00
Ramon Wenger 4a2492ef50 Clean up code 2019-04-09 12:57:05 +02:00
Christian Cueni 8b53d2fa7e add my schoolclasses query, fix test 2019-04-09 11:27:30 +02:00
Christian Cueni e3b4f658e2 add hint in pw form 2019-04-09 09:18:42 +02:00
Christian Cueni 0ee5f65b10 add actions to room widget 2019-04-09 08:27:54 +02:00
Ramon Wenger 3f229f10ab Fix cypress test 2019-04-08 17:23:46 +02:00
Ramon Wenger d879aa1955 Add mobile navigation 2019-04-08 17:16:35 +02:00
Ramon Wenger db96fbac84 Adjust some elements to be more mobile friendly 2019-04-08 17:15:16 +02:00
Ramon Wenger 1bce7a710f Remove some non-read-only elements from mobile 2019-04-08 17:12:52 +02:00
Ramon Wenger b95fd6161f Disable user zoom on mobile 2019-04-08 17:11:31 +02:00
Christian Cueni f3289ba881 add subnavigation, minor cleanup 2019-04-08 17:11:08 +02:00
Christian Cueni 13685b082e rename components, add cypress tests, update hash 2019-04-08 14:18:43 +02:00
Christian Cueni 236afbeb4f style for mobile 2019-04-08 09:51:42 +02:00
Christian Cueni e3575bcf97 Handle backenderrors in frontend 2019-04-04 15:57:02 +02:00
Christian Cueni 5b47cc5a43 Add form validation, style form 2019-04-04 13:37:38 +02:00
Christian Cueni d64c641661 Add pw change endpoint in API 2019-04-03 15:53:00 +02:00
Ramon Wenger 7d3bcf0fbd Fix layout in IE 10+ 2019-04-03 10:12:36 +02:00
Ramon Wenger 760e36a344 Remove add room button on mobile 2019-04-01 18:18:26 +02:00
Ramon Wenger d80cfc07e9 Fix styling for start and rooms pages in IE 2019-04-01 16:44:47 +02:00
Ramon Wenger 08e66795b5 Add header to start page 2019-04-01 10:44:53 +02:00
Ramon Wenger afb21fa499 Add moment to dependencies 2019-03-29 16:32:30 +01:00
Christian Cueni ffc6332894 add edit project page 2019-03-28 08:42:37 +01:00
Christian Cueni d03524e803 add entry count to project widget 2019-03-27 15:56:27 +01:00
Christian Cueni f9f1b6819c use id as condition for menu, add owner name 2019-03-27 15:37:59 +01:00
Christian Cueni cdd31516cf hide portfolio menu on role condition 2019-03-27 15:26:12 +01:00
Christian Cueni 0e1bca4c78 add unshare for projects 2019-03-27 14:20:21 +01:00
Christian Cueni 2b39cc92dd implement share project button 2019-03-27 14:09:34 +01:00
Christian Cueni d9f07c1adb refactor widget footer, add possibility to delete project 2019-03-27 09:33:12 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +01:00
Ramon Wenger b49c759bf7 Add some paddings 2019-03-14 09:50:23 +01:00
Ramon Wenger 8754900e84 Add dynamic project entry display and creation to frontend 2019-03-13 17:55:13 +01:00
Ramon Wenger 0a67c322be Add fullscreen image to ImageBlock 2019-03-13 16:33:57 +01:00
Ramon Wenger 4a834b8140 Add play icon to topic page 2019-03-12 10:35:51 +01:00
Ramon Wenger d36bbafb04 Fix cypress test for new project 2019-03-11 22:04:50 +01:00
Ramon Wenger 117e8bf0d8 Add vimeo video to topic 2019-03-11 19:45:28 +01:00