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

2031 Commits

Author SHA1 Message Date
Ramon Wenger 058e809bb4 Add toggle element 2021-03-12 14:30:37 +01:00
Ramon Wenger 244229e534 Use correct paths for refactored components 2021-03-12 14:27:24 +01:00
Ramon Wenger ef359ddebd Move some files 2021-03-12 13:23:23 +01:00
Ramon Wenger adf662533d Add more navigation buttons 2021-03-12 11:19:56 +01:00
Ramon Wenger 2e424198f0 Add settings button 2021-03-12 11:19:56 +01:00
Ramon Wenger 9490ffd443 Add module visibility sync mutation 2021-03-12 11:19:56 +01:00
Ramon Wenger 14022fa9eb Remove unused code 2021-03-12 11:19:56 +01:00
Ramon Wenger b3268a6299 Add settings pages 2021-03-12 11:19:56 +01:00
Ramon Wenger c002b15ec6 Re-add old GraphQL loader 2021-03-09 09:21:39 +01:00
Ramon Wenger 62dec16667 Update logger settings 2021-03-05 11:14:05 +01:00
Ramon Wenger b9a32354ce Update .editorconfig 2021-03-05 10:55:32 +01:00
Ramon Wenger 271b517fdc Merge branch 'hotfix/deleted-survey-answers' into develop 2021-03-03 21:54:37 +01:00
Ramon Wenger ff5b2d28f6 Prevent answers being deleted when opening a completed survey 2021-03-03 21:53:40 +01:00
Ramon Wenger e82bd3fbfb Update build options 2021-03-03 11:46:21 +01:00
Ramon Wenger cd3bbf0651 Remove unused prop parameter 2021-02-24 15:56:41 +01:00
Ramon Wenger c590b373ab Disable footer based on env variable 2021-02-23 16:50:48 +01:00
Ramon Wenger 3660a282a3 Merged in feature/chapter-visibility (pull request #78) 
Feature/chapter visibility

Approved-by: Christian Cueni
 2021-02-23 10:13:16 +00:00
Ramon Wenger 2954c85742 Fix typo 2021-02-22 17:24:59 +01:00
Ramon Wenger 73e3339d81 Remove unused code 2021-02-22 17:09:47 +01:00
Ramon Wenger e10481ce49 Add visibility actions to objective group 2021-02-22 17:04:45 +01:00
Ramon Wenger 6bab4320ec Add constant for default visibility type 2021-02-22 14:31:27 +01:00
Ramon Wenger 322d7725f2 Clean up code 2021-02-22 14:29:21 +01:00
Ramon Wenger fae3043c3b Fix jest tests 2021-02-22 14:09:42 +01:00
Ramon Wenger 623a6c3837 Clean up code 2021-02-22 11:26:11 +01:00
Ramon Wenger b551dd240e Update schema files 2021-02-22 11:21:03 +01:00
Ramon Wenger 16baba9423 Refactor some code 2021-02-18 18:15:19 +01:00
Ramon Wenger d97ad231cc Add visibility menu to Chapter component 2021-02-18 17:58:59 +01:00
Ramon Wenger fa12fb2112 Add new chapter visibility mutations to client 2021-02-18 17:58:08 +01:00
Ramon Wenger 1f0be12486 Re-add ExtractTextPlugin 2021-02-09 16:38:25 +01:00
Ramon Wenger 1eec4e989b Merge branch 'hotfix/portfolio-width' into develop 2021-02-04 11:11:56 +01:00
Ramon Wenger b13ca43736 Fix portfolio width bug (again) 2021-02-04 11:11:27 +01:00
Ramon Wenger db3b07e2c2 Temporarily remove failing test 2021-02-03 15:22:35 +01:00
Ramon Wenger 763b643186 Merge branch 'feature/whitelabel' into develop 2021-02-03 14:31:02 +01:00
Ramon Wenger 6af7201ab2 Fix bug that prevents hiding of objectives 2021-02-03 10:29:43 +01:00
Ramon Wenger b5a5a9b921 Fix project entry width bug 2021-01-28 16:42:54 +01:00
Ramon Wenger 5eadff662d Disable bookmarking when editing a module 2021-01-26 17:29:12 +01:00
Ramon Wenger 6108430389 Add todos, move config 2021-01-26 14:26:28 +01:00
Ramon Wenger 651cc1d67d Get page title from env variable 2021-01-25 17:48:20 +01:00
Ramon Wenger 0ddd0b4b55 Add todo 2021-01-21 20:56:42 +01:00
Ramon Wenger 9ca1cdaa4f Add theme dynamically via env var 2021-01-21 20:13:17 +01:00
Ramon Wenger 54be107654 Fix scss import error 2021-01-21 19:51:32 +01:00
Ramon Wenger a323669cd3 Add whitelabel theme and default variables 2021-01-21 19:15:00 +01:00
Ramon Wenger 173a954516 Enable spell check based on env variable 2021-01-21 16:41:11 +01:00
Ramon Wenger 1f973aa15f Disable portfolio based on env variable 2021-01-20 17:30:40 +01:00
Ramon Wenger b0e89c34f7 Merge branch 'hotfix/survey-hide-solutions' into develop 2021-01-19 17:25:01 +01:00
Ramon Wenger 761ae312e2 Fix handling of visible solutions on survey page 2021-01-19 17:03:28 +01:00
Ramon Wenger ce6b58f384 Merge branch 'hotfix/add-content-button-bug' into develop 2021-01-18 18:20:52 +01:00
Ramon Wenger bfbc7b3d8f Fix un-clickable button for adding content at start of chapter 2021-01-18 16:54:20 +01:00
Ramon Wenger 165f94c861 Add default values for env variables 2021-01-14 16:54:33 +01:00
Ramon Wenger da3070c774 Add prod settings for html interpolation 2021-01-12 22:48:08 +01:00
Ramon Wenger d0f52741e4 Add code comment 2021-01-12 22:38:35 +01:00
Ramon Wenger 767d7a6d87 Add quotation marks to html 2021-01-12 20:36:56 +01:00
Ramon Wenger 3783bd4214 Get logo and icon from env variables 2021-01-12 19:30:04 +01:00
Ramon Wenger 95f00b6bba Add build step for iterativ academy, update docker image 
Squashed commit of the following:

commit 0532315d4e679a145d783fd7a495669beae3f6aa
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 17:12:57 2021 +0100

    Add deploy step to correct pipeline

commit 2a54d2f259f821f74d48dd26c803f8cc870ae026
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:53:43 2021 +0100

    Update dependencies in dockerfile

commit 550869366c009852c9d2856c27ab71e072238e93
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:17:42 2021 +0100

    Update cypress step

commit 348ec30d6682ba726127d383b87356415cea05bb
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:06:41 2021 +0100

    Update pipelines

commit f8b1f50f1eaead7a06b336b03f5ad561ab92b278
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 15:59:31 2021 +0100

    Change node version

commit be33eafdb0e90bd815efb6a341b9a8e05a4598bb
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 15:45:23 2021 +0100

    Remove cypress install step from Dockerfile

commit c28ab32e80cd05e12a420abfdaaf2ac1c4d551a4
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 20:43:58 2021 +0100

    Update package-lock

commit 86114b91fae176fe9d8f42bf1e78dced75ea8e51
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 20:35:57 2021 +0100

    Update cypress version

commit 11174d92fe36c4d8d0e8bba35fa2da7b64b1c4e2
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 16:48:49 2021 +0100

    Update Pipfile.lock

commit 4a302df907eddae34f02c1816ae064c2384385e6
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 15:51:42 2021 +0100

    Update python version

commit ac54ec57e7691b5c21459ac40ad20479aade56dd
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 15:00:40 2021 +0100

    Remove ipython

commit a9c72d7d2f3c1027d4b04e81d68afd78d0460a8a
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 13:59:08 2021 +0100

    Add deploy step for iterativ academy
 2021-01-11 16:38:47 +01:00
Ramon Wenger cbf7c10aff Add build step for iterativ academy, update docker image 
Squashed commit of the following:

commit 0532315d4e679a145d783fd7a495669beae3f6aa
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 17:12:57 2021 +0100

    Add deploy step to correct pipeline

commit 2a54d2f259f821f74d48dd26c803f8cc870ae026
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:53:43 2021 +0100

    Update dependencies in dockerfile

commit 550869366c009852c9d2856c27ab71e072238e93
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:17:42 2021 +0100

    Update cypress step

commit 348ec30d6682ba726127d383b87356415cea05bb
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 16:06:41 2021 +0100

    Update pipelines

commit f8b1f50f1eaead7a06b336b03f5ad561ab92b278
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 15:59:31 2021 +0100

    Change node version

commit be33eafdb0e90bd815efb6a341b9a8e05a4598bb
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Thu Jan 7 15:45:23 2021 +0100

    Remove cypress install step from Dockerfile

commit c28ab32e80cd05e12a420abfdaaf2ac1c4d551a4
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 20:43:58 2021 +0100

    Update package-lock

commit 86114b91fae176fe9d8f42bf1e78dced75ea8e51
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 20:35:57 2021 +0100

    Update cypress version

commit 11174d92fe36c4d8d0e8bba35fa2da7b64b1c4e2
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 16:48:49 2021 +0100

    Update Pipfile.lock

commit 4a302df907eddae34f02c1816ae064c2384385e6
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 15:51:42 2021 +0100

    Update python version

commit ac54ec57e7691b5c21459ac40ad20479aade56dd
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 15:00:40 2021 +0100

    Remove ipython

commit a9c72d7d2f3c1027d4b04e81d68afd78d0460a8a
Author: Ramon Wenger <ramon.wenger@iterativ.ch>
Date:   Wed Jan 6 13:59:08 2021 +0100

    Add deploy step for iterativ academy
 2021-01-07 17:54:49 +01:00
Ramon Wenger b7057f2f49 Fix footer bug in Chrome 2020-11-25 10:04:31 +01:00
Ramon Wenger 8f2e2ccb7d Remove unused query 2020-11-19 17:09:22 +01:00
Ramon Wenger c9735207c2 Fix student submission feedback bug on turning in 2020-11-19 13:51:34 +01:00
Ramon Wenger 532f788cc9 Fix cache miss 2020-11-17 16:23:43 +01:00
Ramon Wenger 5586f28250 Fix style issue on submissions page 2020-11-17 16:13:37 +01:00
Ramon Wenger ecec97a411 Fix vanishing text bug on submission feedback 2020-11-17 14:03:10 +01:00
Ramon Wenger 80382d6bb5 Add logout button to license activation page 2020-11-11 13:24:12 +01:00
Ramon Wenger 47b5d2e037 Fix student submission feedback bug 2020-11-05 09:59:53 +01:00
Ramon Wenger 0a9c1680de Update styling of survey answers 2020-10-20 10:27:34 +02:00
Ramon Wenger c39c35332e Merge branch 'hotfix/survey-answers' into develop 2020-10-14 18:54:46 +02:00
Ramon Wenger 44274b3f09 Handle questions without correct answer set 2020-10-14 18:53:23 +02:00
Ramon Wenger 0e166a6b10 Fix a bug for matrix answers in surveys 
The bug can appear if a question has inconsistent punctuation in the
indexes of its rows compared to other surveys.
 2020-10-14 18:08:53 +02:00
Ramon Wenger a45096a4b7 Fix alignment of current class name 2020-10-08 18:24:39 +02: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 65e31f6893 Add more spacing in task type content blocks 2020-10-08 11:00:08 +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 801c8a7d2e Make news teaser spacing more consistent 2020-10-07 13:48:42 +02:00
Ramon Wenger e94573cd09 Format matrix solutions in a more readable way 2020-10-07 11:22:15 +02:00
Ramon Wenger 4193af9ef6 Remove bottom margin on the room page 2020-10-06 09:50:43 +02:00
Ramon Wenger ea97549d3e Fix layout of 'add room entry' button on room page 2020-10-06 09:36:56 +02:00
Ramon Wenger efd1c7e8f7 Force correct order and newlines for matrix solutions 2020-10-05 15:07:16 +02:00
Ramon Wenger a9de3fe403 Fix footer styling on mobile 
Also fix padding on body and footer on mobile
 2020-09-30 17:50:50 +02:00
Ramon Wenger af71a5a282 Add objective ordering 2020-09-30 17:20:22 +02:00
Ramon Wenger 76b14e3cc8 Add intro to instruments 2020-09-29 13:56:17 +02:00
Christian Cueni 5057e54e4d Merged in hotfix/typos (pull request #75) 
Hotfix/typos
 2020-09-28 16:56:40 +00:00
Ramon Wenger 886550c224 Add interdisciplinary objective groups 2020-09-28 17:55:49 +02:00
Christian Cueni 68ec0e981e Fix cypress test 2020-09-28 15:06:14 +02:00
Ramon Wenger ab989d15a7 Add more spacing on start page 2020-09-28 14:54:35 +02:00
Ramon Wenger adf9c6abed Allow for longer school class names 2020-09-28 14:43:01 +02:00
Christian Cueni 33bd20d44b Fix typos 2020-09-28 14:18:21 +02:00
Christian Cueni bdedc22a32 Fix portfolio query 2020-09-08 14:42:39 +02:00
Ramon Wenger bb50fc75a0 Add button with loading spinner component 2020-08-04 11:31:32 +02:00
Ramon Wenger 6360f1950a Add loading button component 2020-08-04 10:33:49 +02:00
Ramon Wenger b0b46e12b0 Add 404 page with styling 2020-08-04 10:33:28 +02:00
Ramon Wenger 45070220a6 Add error toast 2020-08-03 14:36:01 +02:00
Ramon Wenger 16c587ea59 Clean up semicolons 2020-08-03 14:35:25 +02:00
Ramon Wenger bf42462988 Change wording 2020-07-22 16:19:01 +02:00
Ramon Wenger 647144511f Fix cypress tests 2020-07-22 14:49:45 +02:00
Ramon Wenger 5332e60dba Change some wording, fix typos 2020-07-22 11:36:10 +02:00
Ramon Wenger 1c3f7000cc Update support info 2020-07-22 11:25:50 +02:00
Ramon Wenger 78137550b5 Update support info 2020-07-20 11:49:34 +02:00
Ramon Wenger 4b4b43da29 Update cypress 2020-07-10 16:46:42 +02:00
Ramon Wenger f8458b8139 Add onboarding cypress test, fix join class procedure 2020-07-10 16:46:10 +02:00
Ramon Wenger 2c0039be42 Fix cypress tests 2020-07-10 15:15:56 +02:00
Ramon Wenger e9d8fdad24 Fix cypress tests 2020-07-10 11:49:00 +02:00
Ramon Wenger c50aa19f94 Add new schema, fix cypress tests 2020-07-10 10:12:27 +02:00
Ramon Wenger f588abee43 Add onboarding visited flag to user 2020-07-07 22:31:25 +02:00
Ramon Wenger 5778f98448 Replace illustrations 2020-07-07 16:27:18 +02:00
Ramon Wenger e6fe2397b7 Add onboarding sub-pages 2020-07-07 15:49:01 +02:00
Ramon Wenger 62338a5ddb Add onboarding page with first layout implementation 2020-07-07 09:42:29 +02:00
Ramon Wenger 28a617e5f5 Merge branch 'hotfix/checkboxes-in-edge' into develop 2020-07-02 15:44:26 +02:00
Ramon Wenger e2b9e01aed Fix checkboxes in edge 2020-07-02 15:43:44 +02:00
Ramon Wenger 44e7e4c322 Clean up code 2020-07-02 12:32:44 +02:00
Ramon Wenger 10cc8ca3ba Add new test scenario and fix it 2020-07-02 11:12:00 +02:00
Ramon Wenger 240fcf0795 Display text when no modules have been visited by the user 2020-07-01 11:33:15 +02:00
Ramon Wenger 0d6cf15e78 Update some styles 2020-06-30 18:06:56 +02:00
Ramon Wenger f3d3f4c21f Refactor last topic route 2020-06-30 18:06:34 +02:00
Ramon Wenger f4f9b7c1a1 Refactor and update news teasers on start page 2020-06-30 18:05:45 +02:00
Ramon Wenger fb794bb9dd Add missing fixture 2020-06-29 18:00:15 +02:00
Ramon Wenger 33b9284804 Update cypress version 2020-06-29 17:21:05 +02:00
Ramon Wenger ae3f990898 Fix broken cypress tests 2020-06-29 17:20:50 +02:00
Ramon Wenger 841b75e0db Add cypress test for new start page 2020-06-29 16:54:52 +02:00
Ramon Wenger 943ac76859 Archive old start page 2020-06-29 16:39:44 +02:00
Ramon Wenger feb6a87888 Show recent modules on start page 2020-06-25 15:19:42 +02:00
Ramon Wenger f57e5fa0c1 Add module to recently visited modules on visit 2020-06-25 15:19:08 +02:00
Ramon Wenger e899bbe21b Add recently visited modules to user 2020-06-25 15:12:59 +02:00
Ramon Wenger 991efbe613 Remove 'forgot password' link 2020-06-22 10:47:26 +02:00
Ramon Wenger 2d069c589f Highlight active navigation link with brand color 2020-06-22 09:55:01 +02:00
Ramon Wenger 8605fd4683 Update styling of topic link in module 2020-06-18 18:35:22 +02:00
Ramon Wenger 723a26b810 Remove navigation border when not on module page 2020-06-18 18:27:39 +02:00
Ramon Wenger c0f6ab543b Add sidebar transitions 2020-06-18 17:25:08 +02:00
Ramon Wenger eee6cfefbb Close sidebars on click outside 2020-06-18 16:10:34 +02:00
Ramon Wenger da5bd1e439 Merged in feature/save-last-topic (pull request #67) 
Save last topic and go there on topic navigation

Approved-by: Christian Cueni
 2020-06-18 14:08:18 +00:00
Ramon Wenger b5fbc562b5 Clean up code 2020-06-18 11:54:02 +02:00
Ramon Wenger b32cb89a85 Fix cypress tests 2020-06-18 11:53:05 +02:00
Christian Cueni d6e8db5f99 Make linter happy 2020-06-17 14:38:49 +02:00
Christian Cueni e07e0a199a Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-17 14:22:31 +02:00
Christian Cueni 1b4a0da2e1 Merged in feature/news (pull request #65) 
Feature/news

Approved-by: Ramon Wenger
 2020-06-17 11:53:45 +00:00
Ramon Wenger 0080cf283e Fix linting errors 2020-06-16 16:40:19 +02:00
Ramon Wenger c6bdae3fd3 Save last topic and go there on topic navigation 2020-06-16 16:29:41 +02:00
Christian Cueni b64bd5b614 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-16 13:51:31 +02:00
Christian Cueni 8272eaf117 Merged in feature/accept-terms (pull request #64) 
Feature/accept terms

Approved-by: Ramon Wenger
 2020-06-16 11:42:46 +00:00
Christian Cueni 49cd6e590f Remove trailing comma 2020-06-16 13:18:24 +02:00
Ramon Wenger a9b3dddd8b Make scroll up button a bit more noticeable 2020-06-15 16:01:21 +02:00
Ramon Wenger 711f67b5eb Add scroll top component 2020-06-15 15:06:11 +02:00
Christian Cueni 1d60a76760 Use correct property 2020-06-04 13:22:17 +02:00
Christian Cueni 17d3978c46 Fix registration tests 2020-06-04 13:21:30 +02:00
Christian Cueni 3f8c604a0c Remove migrations, rename html properties 2020-06-04 13:20:30 +02:00
Christian Cueni 2313073019 Omit failing test 2020-06-04 13:19:17 +02:00
Christian Cueni 995fcf09ad Force checkbox 2020-06-04 13:19:17 +02:00
Christian Cueni f9d77a5179 Change selector 2020-06-04 13:19:17 +02:00
Christian Cueni a4ac9d57cb Update tests 2020-06-04 13:19:17 +02:00
Christian Cueni 20a6290eb9 Update copy 2020-06-04 13:19:17 +02:00
Christian Cueni d9fd4dac35 Enforce terms in proxy 2020-06-04 13:19:17 +02:00
Christian Cueni 012ff7c604 Add confirmation field 2020-06-04 13:19:17 +02:00
Ramon Wenger 1e944f3c1b Update styling 2020-06-04 13:03:25 +02:00
Ramon Wenger 9fedebd42c Update topic page 2020-06-04 13:02:19 +02:00
Ramon Wenger 7105082a56 Update topic url 2020-06-04 12:59:47 +02:00
Christian Cueni 0b19f6c697 Rename app, update css classes 2020-06-03 13:25:53 +02:00
Ramon Wenger 2d5c84e842 Update links in navigation 2020-06-03 10:57:48 +02:00
Ramon Wenger 26bb96b025 Set fixed dimensions for cross icon 2020-06-03 10:57:30 +02:00
Christian Cueni 7685fb7599 Use toRem fn 2020-06-03 07:09:06 +02:00
Christian Cueni c4943c8975 Rename class 2020-06-03 07:07:18 +02:00
Ramon Wenger f0cf98f80a Remove unused files 2020-06-02 16:48:10 +02:00
Ramon Wenger b5d9d6a998 Refactor handling of mobile view 2020-06-02 16:46:58 +02:00
Ramon Wenger 2ebceec717 Implement new sidebar styling 2020-06-02 16:46:02 +02:00
Ramon Wenger 6e77cfe433 Update some styles 2020-06-02 16:41:08 +02:00
Ramon Wenger 986809247a Add sidebar component to layouts 2020-06-02 16:38:14 +02:00
Ramon Wenger 283ee0db9b Remove obsolete property from state 2020-06-02 16:34:28 +02:00
Ramon Wenger 5db13e9124 Refactor sidebar state to allow for multiple sidebars 2020-06-02 09:37:12 +02:00
Christian Cueni deeab23088 Add link, align date on bottom 2020-05-28 13:56:18 +02:00
Christian Cueni 1437f465de Add tiny font, update date language 2020-05-28 08:41:15 +02:00
Ramon Wenger 6d43226ebb Merge branch 'hotfix/lockdown-news' into develop 2020-05-27 18:09:45 +02:00
Ramon Wenger 8dfc862efb Add new news entry, remove old one 2020-05-27 18:07:53 +02:00
Ramon Wenger 7f118a9161 Fix eslint issues 2020-05-27 16:24:37 +02:00
Christian Cueni 12c5bf8d90 Format date, style source 2020-05-27 11:51:43 +02:00
Ramon Wenger 93d7a3f959 Add environment information to frontend dev server 2020-05-27 10:12:18 +02:00
Ramon Wenger aad4f1f846 Fix Infogram resize bug 2020-05-26 15:06:16 +02:00
Christian Cueni 8ce5401311 Add basic grid 2020-05-25 15:36:55 +02:00
Ramon Wenger 07059f63f4 Add missing ID 2020-05-25 14:45:23 +02:00
Ramon Wenger 38e99e4747 Add and fix some more rules 2020-05-25 14:19:12 +02:00
Ramon Wenger d6772bb3db Update linter rules and fix them 2020-05-25 14:19:12 +02:00
Christian Cueni 03a8b35466 Add source, add tests 2020-05-25 12:41:12 +02:00
Christian Cueni 6933e10a7f Add news page, add field 2020-05-20 15:42:50 +02:00
Christian Cueni 888fb8e7da Merge branch 'hotfix/links' into develop 2020-05-14 07:23:10 +02:00
Christian Cueni e555dd273f Update footer links 2020-05-14 07:22:37 +02:00
Christian Cueni fe82410947 Remove comment 2020-05-12 14:42:49 +02:00
Christian Cueni ce299e0f0e Merged in feature/licensing (pull request #50) 
Feature/licensing
 2020-05-12 11:37:17 +00:00
Christian Cueni a33609e7b2 Fix tests 2020-05-12 12:41:22 +02:00
Christian Cueni d159876472 Rename input variable 2020-05-12 11:20:43 +02:00
Christian Cueni 47129e81a6 Clean up code 2020-05-12 10:59:22 +02:00
Christian Cueni 685fa3ff34 Use built-in graphql errors 2020-05-12 09:56:48 +02:00
Christian Cueni edd431671f Remove unused variables, simplify tests 2020-05-12 08:11:51 +02:00
Ramon Wenger bf3e2db7a9 Prevent overwrite bug in student submission feedback form 2020-05-07 17:23:50 +02:00
Ramon Wenger aaffaf015a Fix room color bug 2020-05-07 15:42:28 +02:00
Ramon Wenger 5aaa854918 Refactor filtering on activity pages 2020-05-07 12:26:15 +02:00
Ramon Wenger 6d5e66c469 Remove unused code 2020-05-07 12:25:41 +02:00
Ramon Wenger a883a4f221 Clean up code 2020-05-07 11:42:44 +02:00
Ramon Wenger 2ab1073826 Remove unused component 2020-05-06 18:03:09 +02:00
Ramon Wenger e60d88dcf0 Replace old instrument overview with new one 2020-05-06 16:52:22 +02:00
Christian Cueni a0733d1caf Remove unused page, fix password error display 2020-05-06 09:04:31 +02:00
Christian Cueni b222fc86e4 Style pages, remove no-class page 2020-05-06 08:37:30 +02:00
Christian Cueni 490ce15db2 Fix public layout 2020-05-05 07:04:18 +02:00
Christian Cueni 5be7428b70 Style links 2020-05-04 15:22:35 +02:00
Christian Cueni 4282c9df06 Fix beta login tests 2020-05-04 12:53:37 +02:00
Christian Cueni 4dbd0b19ae Change url 2020-05-04 11:14:47 +02:00
Christian Cueni 91c83defb0 Fix schema 2020-05-04 10:27:55 +02:00
Christian Cueni 9a2991961c Update schema generation 2020-05-04 09:31:44 +02:00
Christian Cueni ce1e75b5f0 Fix client.js 2020-04-30 15:31:09 +02:00
Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing 
# Conflicts:
#	client/config/dev.env.js
#	client/config/prod.env.js
#	client/cypress/fixtures/schema.json
#	client/cypress/integration/beta-login.spec.js
#	client/package-lock.json
#	client/src/graphql/client.js
#	client/src/layouts/PublicLayout.vue
#	client/src/main.js
#	client/src/styles/main.scss
#	server/core/settings.py
#	server/registration/mutations_public.py
#	server/users/factories.py
#	server/users/models.py
#	server/users/schema.py
 2020-04-30 15:22:55 +02:00
Christian Cueni fd619ab47b Fix login error messages 2020-04-30 14:17:56 +02:00
Christian Cueni 0aa1625837 Update links, add group_id in customer 2020-04-30 12:16:24 +02:00
Christian Cueni 55f120f1ff Update links to shop 2020-04-30 10:54:00 +02:00
Christian Cueni ebc8d070f6 Remove error field from query 2020-04-30 09:12:36 +02:00
Christian Cueni d46cc7a177 Use remove error field, fix tests 2020-04-30 08:49:54 +02:00
Christian Cueni d10517b4f5 Update env variables 2020-04-30 06:49:18 +02:00
Christian Cueni b14ed2fb5a Change url, add group_id 2020-04-27 08:14:39 +02:00
Christian Cueni 061959e2ac Test url 2020-04-20 15:48:33 +02:00
Ramon Wenger a6ccae96fe Fix typos 2020-04-17 13:48:32 +02:00
Ramon Wenger 32ab006abe Standardize font size of buttons 2020-04-16 14:40:16 +02:00
Ramon Wenger 1d6b76dae8 Add sponsor links 2020-04-16 14:33:26 +02:00
Ramon Wenger ea789482e8 Add margin to footer 2020-04-14 15:57:35 +02:00
Ramon Wenger a799160501 Update icon 2020-04-14 15:53:59 +02:00
Ramon Wenger 1e5c66fb64 Clean up code 2020-04-14 12:18:25 +02:00
Ramon Wenger 10078cde5f Parse answers from survey matrix 2020-04-14 10:43:27 +02:00
Ramon Wenger 5da7665f79 Merged in feature/footers (pull request #57) 
Feature/footers

Approved-by: Christian Cueni
 2020-04-14 07:34:18 +00:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger c1ac3e779f Add instructions to client 2020-04-10 21:28:39 +02:00
Ramon Wenger 159aef3075 Add logos 2020-04-09 17:09:01 +02:00
Ramon Wenger 299f4aad5b Add new footers 2020-04-09 16:26:53 +02:00
Ramon Wenger 9bf7f2e9fa Merged feature/new-favicons into develop 2020-04-09 09:57:46 +02:00
Ramon Wenger bf7cf24457 Adjust matrix styling 2020-04-08 17:19:13 +02:00
Ramon Wenger 04ae5a22a8 Add new favicons 2020-04-08 14:16:03 +02:00
Ramon Wenger a834523c54 Merged in feature/matrix (pull request #55) 
Feature/matrix

Approved-by: Christian Cueni
 2020-04-08 09:33:37 +00:00
Ramon Wenger 2af1714044 Clean up code 2020-04-08 11:22:41 +02:00
Ramon Wenger dc66293684 Add interdisciplinary instrument 2020-04-08 10:50:06 +02:00
Ramon Wenger 1a8e28c114 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-04-07 16:18:58 +02:00
Ramon Wenger 4c149eb48e Update styles 2020-04-07 16:17:11 +02:00
Ramon Wenger 4047edff0a Add matrix styling in surveys 2020-04-07 15:55:04 +02:00
Ramon Wenger 533cf186ee Update surveyjs version 2020-04-07 12:04:10 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger 42960f531d Add new icon 2020-04-02 23:02:26 +02:00
Ramon Wenger ad3e3fa629 Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
Ramon Wenger 68b751d325 Add matomo sanity check 2020-04-01 17:45:07 +02:00
Ramon Wenger a42201d876 Add matomo config 2020-04-01 17:25:59 +02:00
Ramon Wenger b94bda6c15 Add icon to add class link 2020-03-30 16:23:14 +02:00
Ramon Wenger bef33cea09 Fix styling of logout button 2020-03-30 14:44:27 +02:00
Ramon Wenger 8211b38305 Remove support link in navigation 2020-03-30 14:39:13 +02:00
Ramon Wenger c4956445e8 Disable cypress test 2020-03-30 14:36:15 +02:00
Ramon Wenger 18d7025f26 Disable deactivation of users in school classes 2020-03-30 14:29:34 +02:00
Ramon Wenger f4d7f5f336 Fix cypress test 2020-03-25 19:38:16 +01:00
Ramon Wenger 99856af550 Fix minor bugs 2020-03-25 16:06:27 +01:00
Ramon Wenger e26c4b7093 Hide solutions on completed survey 2020-03-25 15:48:25 +01:00
Ramon Wenger 2d6724db9e Re-write local cache on client reset 
Also clean up some code
 2020-03-25 14:20:09 +01:00
Ramon Wenger e177608360 Refactor another plugin 2020-03-25 13:15:18 +01:00
Ramon Wenger 6082d37177 Clean up code 2020-03-25 13:10:46 +01:00
Ramon Wenger 32e3c6067b Move modal to plugin 2020-03-25 12:58:53 +01:00
Ramon Wenger 18d52f8d2e Fix cypress test 2020-03-24 16:48:11 +01:00
Ramon Wenger b13ca67d78 Fix section title block 2020-03-24 16:23:46 +01:00
Ramon Wenger 4173fe70ab Add confirmation modal when deactivating users in school class 2020-03-24 16:16:13 +01:00
Ramon Wenger d8f82c0e73 Add support e-mail link 2020-03-23 22:21:09 +01:00
Ramon Wenger 0dec39c094 Fix cypress test 2020-03-23 09:09:11 +01:00
Ramon Wenger b7c996dab2 Only show inactive users title when there are such users 2020-03-22 23:49:09 +01:00
Ramon Wenger 07452cae7e Hide 'add class' button for students 2020-03-22 23:39:13 +01:00
Ramon Wenger 4bd2c9c065 Add page to display the class code 2020-03-20 22:49:51 +01:00
Ramon Wenger 1382bbd674 Update cypress version 2020-03-20 22:47:51 +01:00
Ramon Wenger 9c80b07194 Fix cypress test 2020-03-20 22:07:20 +01:00
Ramon Wenger c6af0402d0 Fix cypress test 2020-03-20 16:01:12 +01:00
Ramon Wenger aea1c55c18 Disable misbehaving tests for now 2020-03-20 10:46:36 +01:00
Ramon Wenger bedbcd6fa0 Fix new student test 2020-03-20 10:43:00 +01:00
Ramon Wenger 950fe9c60e Add "create class" view 2020-03-20 10:14:55 +01:00
Ramon Wenger d4845f0dd1 Add mutation for creating school classes 2020-03-19 11:43:57 +01:00
Christian Cueni 0e52ab6f49 Clean up code 2020-03-17 14:20:06 +01:00
Christian Cueni 9617a1ee88 Revert "Use GraphQL for email available" 
This reverts commit 24cccbf053.
 2020-03-17 13:29:40 +01:00
Christian Cueni 24cccbf053 Use GraphQL for email available 2020-03-16 16:50:19 +01:00
Ramon Wenger e2b3fdaece Update schema for new cypress test 2020-03-16 10:25:52 +01:00
Ramon Wenger f222a6aa3b Clean up test code 2020-03-14 11:45:21 +01:00
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger 7c9d425a5e Clean up code 2020-03-12 18:06:05 +01:00
Ramon Wenger a00206499b Close sidebar on click outside of it 2020-03-11 17:54:47 +01:00
Ramon Wenger c1341a8ac9 Fix iOS bug 2020-03-11 16:02:57 +01:00
Ramon Wenger 8d5e9845e4 Fix cypress test 2020-03-11 13:44:40 +01:00
Ramon Wenger 3368d03ede Merge branch 'hotfix/news-entry' into develop 2020-03-11 11:47:51 +01:00
Ramon Wenger 24b66bbf9e Add new news entry 2020-03-11 11:47:02 +01:00
Ramon Wenger 9c7e4c92ca Add margin bottom to infogram blocks 2020-03-11 11:13:15 +01:00
Ramon Wenger 7837bc930e Fix some minor issues 2020-03-10 23:08:18 +01:00
Ramon Wenger e6f852fdc4 Clean up code 2020-03-10 15:35:55 +01:00
Ramon Wenger 394469d773 Add new cypress test and fix old ones 2020-03-10 10:16:30 +01:00
Christian Cueni 63a1a24847 Fix Beta Login 2020-03-09 16:41:17 +01:00
Christian Cueni 5d614dd7e5 Fix minor issues 2020-03-09 16:22:56 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Ramon Wenger 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni 59d5376f60 Handle native GraphQLErrors 2020-03-09 14:53:00 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00
Ramon Wenger 985ccd0e62 Refactor simple list styling, also some other style polishing 2020-03-08 11:51:56 +01:00
Ramon Wenger f4270b8243 Remove actions in class list for students 2020-03-05 16:41:07 +01:00
Ramon Wenger 9dab0856e8 Remove and add members in client 2020-03-05 16:20:57 +01:00
Ramon Wenger 4a3d08203d Enable adding previous members to school classes 2020-03-05 16:18:30 +01:00
Ramon Wenger b82b82369c Add mutation to remove member from class 2020-03-05 15:14:26 +01:00
Ramon Wenger a99a073460 Distinguish between active and inactive users in class list 2020-03-04 16:57:15 +01:00
Ramon Wenger ad8409f783 Fix a visual bug with the sidebar 2020-03-04 16:56:34 +01:00
Ramon Wenger b3457502d9 Change class list to display only currently selected class 2020-03-02 18:38:36 +01:00
Ramon Wenger 0ac0f3d610 Fix cypress test 2020-02-27 16:59:00 +01:00
Ramon Wenger 58d5e47158 Remove superfluous links from mobile navigation 2020-02-27 16:11:02 +01:00
Ramon Wenger 82aa0f5bd4 Fix clip path in avatar 2020-02-27 16:06:11 +01:00
Christian Cueni 1d7ca9f612 Fix more tests 🤪 2020-02-27 16:03:22 +01:00
Ramon Wenger ba1f518816 Update mobile navigation styling 2020-02-27 15:44:32 +01:00
Christian Cueni d91e0fbb37 Update registration tests 2020-02-27 15:05:45 +01:00
Ramon Wenger 9d45d5d360 Close sidebar when clicking on class list link 2020-02-27 14:24:28 +01:00
Ramon Wenger fffbc47fde Change profile layout 2020-02-27 14:21:56 +01:00
Ramon Wenger c8449e7fe9 Fix some IE 10 issues 2020-02-27 14:01:13 +01:00
Christian Cueni f08c6bf807 Remove change password spec 2020-02-27 14:00:57 +01:00
Christian Cueni ca90f32e03 Fix cypress tests 2020-02-27 13:37:32 +01:00
Christian Cueni 59f650891c Remove change password test 2020-02-27 11:37:24 +01:00
Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing 
# Conflicts:
#	Pipfile.lock
#	client/cypress/fixtures/schema.json
#	client/src/graphql/client.js
#	client/src/graphql/resolvers.js
#	client/src/graphql/typedefs.js
#	client/src/main.js
#	client/src/router/index.js
#	server/users/models.py
 2020-02-27 10:29:24 +01:00
Christian Cueni 8f9750ebe8 Style beta login pages 2020-02-27 09:10:25 +01:00
Ramon Wenger 162615ce5c Remove password change form 2020-02-26 18:36:31 +01:00
Ramon Wenger 5054f21bc9 Update wording 2020-02-26 16:01:26 +01:00
Ramon Wenger 1c71c24ea0 Change redirect for new student, also add new test 2020-02-26 12:48:30 +01:00
Ramon Wenger e869cc8829 Add mixin for `me` query 2020-02-26 12:48:07 +01:00
Ramon Wenger dccbf2ae1a Fix cypress test 2020-02-26 12:47:33 +01:00
Ramon Wenger 0ffe77b745 Add more data properties 2020-02-26 12:47:20 +01:00
Christian Cueni 5e77ee0cee Fix helloEmail, make linter happy 2020-02-26 12:44:41 +01:00
Christian Cueni 3d63a7933d Rename local login url 2020-02-25 16:22:27 +01:00
Ramon Wenger ee78a3229f Refactor mixins 2020-02-25 15:46:11 +01:00
Ramon Wenger 4f7a2cdc2f Move class selection to sidebar, refactor it in the process 2020-02-25 15:46:11 +01:00
Christian Cueni b572523a33 Add proxy for registration call 2020-02-25 14:42:42 +01:00
Ramon Wenger a7413c6ce0 Merged in feature/multiple-classes-for-everyone (pull request #46) 
Feature/multiple classes for everyone

Approved-by: Christian Cueni
 2020-02-25 08:42:21 +00:00
Ramon Wenger 2e1d7b46bc Add error message and add styling 2020-02-24 18:32:55 +01:00
Ramon Wenger a59733b2f1 Add redirect after joining class 2020-02-24 16:23:55 +01:00
Ramon Wenger ca97a15398 Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone 2020-02-24 16:11:25 +01:00
Christian Cueni a481989348 Add footer 2020-02-24 15:17:11 +01:00
Christian Cueni a28c462a1e Merge branch 'hotfix/postgres-pipelines' into feature/licensing 2020-02-24 11:32:18 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni 1152f1fd95 Add forgot password page, add cancel button to login 2020-02-20 11:24:10 +01:00
Christian Cueni c93d2f6843 Remove hep id as default 2020-02-18 16:57:36 +01:00
Christian Cueni e9713c736b Redirect to hello, add redirect query param 2020-02-18 16:32:12 +01:00
Christian Cueni e067717d50 Fix local login 2020-02-18 16:01:20 +01:00
Christian Cueni 3c72c9559e Split token and local login 2020-02-18 14:36:49 +01:00
Christian Cueni 42d16caafc Allow coupon calls 2020-02-18 14:10:04 +01:00
Christian Cueni f3bd38e819 Redirect users without license to coupon page 2020-02-18 13:48:45 +01:00
Christian Cueni 26a342c5a5 Fix license verification flow 2020-02-18 13:32:17 +01:00
Ramon Wenger fb65e23f3d Update news links on start page 2020-02-18 10:24:17 +01:00
Ramon Wenger 878937257e Rename top navigation to content navigation 2020-02-18 10:22:56 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Ramon Wenger c0cbffecbc Add sidebar to the blank layout 2020-02-18 09:21:32 +01:00
Ramon Wenger 99ef303c4d Move logout link to sidebar 2020-02-18 09:21:15 +01:00
Ramon Wenger e96211803b Clean up code 2020-02-18 09:20:47 +01:00
Ramon Wenger ef4f8aefd3 Add user data to profile widget 2020-02-17 16:50:07 +01:00
Ramon Wenger 5b67ecfb8c Add profile edit link to sidebar 2020-02-17 16:20:53 +01:00
Ramon Wenger 2f00a98838 Add new default user avatar 2020-02-17 16:16:33 +01:00
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
Christian Cueni 36c43bf4e1 Detect 402 in frontend, allow me query 2020-02-17 16:08:47 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Ramon Wenger d22a77e513 Update styling on join class page 2020-02-13 15:51:50 +01:00
Christian Cueni d5276d5adc Update and test front end email verification 2020-02-13 12:42:17 +01:00
Christian Cueni 909f7337ac Fix email verification for stage 2020-02-13 11:28:23 +01:00
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 97469ce419 Mock the backend for the cypress test 2020-02-12 21:01:26 +01:00
Ramon Wenger 76fa510053 Update local school class cache after joining a class 2020-02-12 20:28:46 +01:00
Christian Cueni f5ddff12e3 Add email verification tests 2020-02-12 15:49:56 +01:00
Christian Cueni 6509b31ab5 Add registration tests 2020-02-12 13:37:36 +01:00
Ramon Wenger 919c0aec18 Add loading message for spellcheck 2020-02-12 10:37:34 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +01:00
Christian Cueni dd272757bf Add login tests 2020-02-11 16:47:21 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni b36ba5f9a1 Add email verifcation page 2020-02-11 14:44:14 +01:00
Christian Cueni a0eeec4e18 Add extra fields to registration, remove unused fields 2020-02-11 14:44:14 +01:00
Christian Cueni 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Christian Cueni 1d50287dbf Add basic registration flow 2020-02-11 14:41:55 +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 c4cacac1c7 Update schema, fix cypress test 2020-02-04 22:05:12 +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 c9222adf60 Update cypress tests to mock the server 2020-01-20 17:14:20 +01:00
Ramon Wenger 2b9d14222d Fix order of corrections 2020-01-20 13:03:01 +01:00
Ramon Wenger bc9bf8cdec Remove modules from manual cache definition 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 cdb2570203 Add schema file, also add instructions to readme 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 ff7a6b93b3 Add first implementation of a test with mocked GraphQL calls 2020-01-20 13:01:47 +01:00
Ramon Wenger 9ee3dc48b5 Add login via GraphQL to cypress commands 2020-01-20 13:01:00 +01:00
Ramon Wenger 7f71977523 Add initial frontend implementation for spell checks 2020-01-20 13:01:00 +01:00
Ramon Wenger a195492ece Temporarily disable problematic test 2020-01-20 11:06:51 +01:00
Ramon Wenger 6c8628f56f Prevent apollo client from throwing errors on 302 response 2020-01-20 10:38:29 +01:00
Ramon Wenger 013b020f68 Upgrade cypress version 2020-01-16 17:48:25 +01:00
Ramon Wenger 68c5375bab Add test to check solution display in surveys 2020-01-16 16:36:27 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07:00 +01:00
Ramon Wenger 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger ea95efc23f Make test fail when it should fail 2020-01-16 15:49:14 +01:00
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +01:00
Ramon Wenger e92412cf21 Clean up code 2020-01-16 14:10:16 +01:00
Ramon Wenger d4d2e9934e Add note to instruments 2020-01-16 10:45:36 +01:00
Ramon Wenger 5200d2165d Use slug to identify instruments on client 2020-01-16 10:44:37 +01:00
Ramon Wenger 35cdd5ff5f Remove superfluous query file 2020-01-13 19:48:46 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger 8765de9603 Add instrument query by id 2020-01-08 14:58:07 +01:00
Ramon Wenger 01ab01a9e9 Add instruments to local cache 2020-01-08 14:56:07 +01:00
Ramon Wenger 27b068e9ef Add news item 2019-12-24 22:23:58 +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 64db0487ca Refresh my activities periodically 2019-12-19 11:35:47 +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 65a09fb9c7 Use the GQL cache for local state 2019-12-18 16:23:33 +01:00
Ramon Wenger 54a6a2a702 Update package versions 2019-12-18 16:16:32 +01:00
Ramon Wenger a713048b86 Add styling for module activity entries 2019-12-18 13:18:42 +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 eba199dc60 Add more emojis! 2019-12-11 11:04:23 +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 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
Christian Cueni 919c9876d6 Add package to dependencies 2019-08-26 14:28:59 +02:00
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
Ramon Wenger 1ebfacfbdb Hide module navigation 2019-03-11 15:49:59 +01:00
Ramon Wenger 99de7270a4 Add new project cypress test 2019-03-11 15:38:39 +01:00
Ramon Wenger 658acd2ed7 Remove unnecessary component 2019-03-11 15:38:39 +01:00
Ramon Wenger 474110126d Wire up portfolio frontend to backend 2019-03-07 10:54:27 +01:00
Ramon Wenger 485a6ca4eb Add portfolio backend 2019-03-07 10:49:52 +01:00
Ramon Wenger 25c282a194 Add project form 2019-03-05 17:58:49 +01:00
Ramon Wenger 32697fcf49 Add links for basic knowledge dropdown 2019-03-05 11:20:23 +01:00
Ramon Wenger e1ea01cbb8 Add basic knowledge overview 2019-03-04 18:54:21 +01:00
Ramon Wenger 0b0033177c Update colors to be in line with style guide 2019-03-04 16:41:37 +01:00
Ramon Wenger e480f06b57 Add subnavigation to routes 2019-03-04 13:29:59 +01:00
Ramon Wenger 652ccfc332 Update typography styles 2019-03-04 13:22:00 +01:00
Ramon Wenger 636740a5a0 Add typography mixins 2019-03-04 13:07:12 +01:00
Ramon Wenger bce54d0f46 Fix initial data on start page 2019-03-01 15:26:18 +01:00
Ramon Wenger 18633d4de8 Remove full screen buttons 2019-03-01 11:23:24 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +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 10ed3e8630 Add new news styling 2019-02-27 16:18:33 +01:00
Ramon Wenger f463c4e61a Add new illustrations to dashboard 2019-02-21 16:47:25 +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 0d99019e94 Make full screen image scrollable 2019-02-20 15:00:40 +01:00
Ramon Wenger 97b3be305f Fix cypress test 2019-02-20 13:43:54 +01:00
Ramon Wenger a50f3737a6 Add full screen modal for images 2019-02-20 10:57:17 +01:00
Ramon Wenger e147d75893 Add assignment text to submissions page 2019-02-19 20:42:06 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 821473cf7a Update solution e2e test and reactivate it 2019-02-14 18:54:57 +01:00
Ramon Wenger 29c9ceb542 Add check for fetched module in module component 2019-02-14 18:54:37 +01:00
Ramon Wenger be7259403e Add cypress command to wait for specific GraphQL query 2019-02-14 18:54:16 +01:00
Ramon Wenger 59495d13c8 Add workaround for cypress.wait for fetch requests 2019-02-14 18:53:00 +01:00
Ramon Wenger 63e98b099f Rename config variable again 2019-02-14 12:34:17 +01:00
Ramon Wenger 3d09cc8e4b Add new config variable 2019-02-14 12:33:15 +01:00
Ramon Wenger c4c025d0cc Change variable name for Google Analytics ID 2019-02-14 12:22:58 +01:00
Ramon Wenger f5d146df95 Add check for Analytics ID 2019-02-14 11:26:47 +01:00
Ramon Wenger be9f4f4aae Add Google Analytics 2019-02-14 10:07:52 +01:00
Ramon Wenger 1c09a0629f Add solution to result page 2019-02-13 16:35:06 +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 31a78b6619 Disable test that is not working consistently for now 2019-02-13 15:49:06 +01:00
Ramon Wenger b01802153e Unify solution e2e tests 2019-02-13 14:15:51 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger f365225830 Fix cypress test 2019-02-05 18:55:12 +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 6e60a17468 Fix cypress test 2019-02-04 17:42:28 +01:00
Ramon Wenger 5ce09a4e13 Add solution block to client (including cypress test) 2019-02-04 15:19:58 +01:00
Ramon Wenger 10841a69be Update cypress test 2019-01-31 16:47:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 662a3b8d4b Add basics for project entry wizard 2019-01-30 10:56:24 +01:00
Ramon Wenger 906b5c88bd Add modal basics for new project entry 2019-01-29 17:35:14 +01:00
Ramon Wenger 85914a1f14 Add project page 2019-01-29 17:34:41 +01:00
Ramon Wenger 8e9cd3600d Add new portfolio page layout 2019-01-29 09:20:18 +01:00
Ramon Wenger c468a13720 Add some more base for cypress testing 2019-01-24 15:15:14 +01:00
Ramon Wenger fc6cf0c0d9 Add new news item 2018-12-19 18:20:41 +01:00
Ramon Wenger 2fa373bc30 Add class filter to results 2018-12-06 16:29:27 +01:00
Ramon Wenger 0080dfe0d7 Fix continuous input bug 2018-12-04 13:24:36 +01:00
Ramon Wenger d46d0dde0a Add mobile styling 2018-11-21 18:33:38 +01:00
Ramon Wenger 1b11599eb8 Remove objective group buttons from students 2018-11-21 18:26:16 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 4bf3f51644 Apply sorting of objective groups to students as well 2018-11-21 15:18:54 +01:00
Ramon Wenger 9a6b9bf3e3 Add edit objective form wizard to client 2018-11-21 14:56:43 +01:00
Ramon Wenger a89c0d006b Save objective group via mutation 2018-11-20 18:48:48 +01:00
Ramon Wenger 35f29cb00f Add second news entry 2018-11-20 17:32:42 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 8d9cb86ae8 Move style for icon button 2018-11-20 15:20:02 +01:00
Ramon Wenger 0e9bd79fa6 Add modal for objective group addition 2018-11-20 15:19:40 +01:00
Ramon Wenger 949846f9d0 Move objective group files to own folder 2018-11-20 15:17:53 +01:00
Ramon Wenger 061e20306a Change wording on start page 2018-11-19 17:41:22 +01:00
Ramon Wenger 3a1d2b8168 Add correct component handling to basic knowledge 2018-11-16 16:20:28 +01:00
Ramon Wenger 6387024f81 Add SRF video embedding 2018-11-14 11:53:28 +01:00
Ramon Wenger ee512dc7c2 Adjust start page navigation 2018-11-01 17:09:32 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger a51a882c1d Update styling 2018-11-01 16:01:13 +01:00
Ramon Wenger b33e75d67a Add placeholder to room form's select input 2018-11-01 16:00:56 +01:00
Ramon Wenger 62bd0b2435 Restrict deletion of rooms to teachers 2018-11-01 15:25:40 +01:00
Ramon Wenger 58d42e2472 Merged in feature/objectives-by-user (pull request #10) 
Feature/objectives by user
 2018-11-01 13:28:15 +00:00
Ramon Wenger e72475fc14 Unify objectives under one objective group for students 2018-11-01 14:24:41 +01:00
Ramon Wenger 5ca9bbb017 Split objective groups by type 2018-11-01 10:58:08 +01:00
Ramon Wenger 4deac16b5d Add static news entry on start page 2018-10-31 16:27:53 +01:00
Ramon Wenger bb5172bde5 Disabled portfolio link and add message to missing page 2018-10-31 16:20:24 +01:00
Ramon Wenger 7c002dcf36 Clean up code 2018-10-31 16:09:37 +01:00
Ramon Wenger 97bea4289e Add visibility popover to objective group widget 2018-10-31 15:37:46 +01:00
Ramon Wenger 9b6207f192 Change title in objective group model 2018-10-30 23:31:54 +01:00
Ramon Wenger 58030fc70d Update package lock 2018-10-30 17:53:30 +01:00
Ramon Wenger 5b50e497c9 Add room entry edit mask 2018-10-30 11:57:41 +01:00
Ramon Wenger c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger acf59b218b Add popover to room entry 2018-10-29 13:30:31 +01:00
Ramon Wenger cc99dd00b1 Generalize popover for widgets 2018-10-29 13:24:24 +01:00
Ramon Wenger daa8491578 Add workaround for cache misses 2018-10-29 13:23:42 +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 6b6277fe6d Add default text for empty submission list 2018-10-25 15:33:04 +02:00
Ramon Wenger 6591958546 Add assignment result link for teacher view 2018-10-25 15:24:48 +02:00
Ramon Wenger 8b8929c728 Change "Aufgabe" to "Auftrag" 2018-10-25 15:00:43 +02:00
Ramon Wenger 96cbb70477 Remove unused code 2018-10-25 14:34:17 +02:00
Ramon Wenger 631a500dca Update styling 2018-10-25 13:55:12 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger aea8beff49 Add navigation by basic knowledge slug 2018-10-25 13:53:13 +02:00
Ramon Wenger 365002f800 Fix assignment submission bug on navigation 2018-10-24 16:49:33 +02:00
Ramon Wenger 543a9ea6e9 Add config for e2e tests 2018-10-24 16:26:06 +02:00
Ramon Wenger b2c67569ab Add e2e test for room entry addition 2018-10-24 16:04:57 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger 617d82f484 Merge branch 'feature/e2e-with-cypress' 2018-10-24 15:19:55 +02:00
Ramon Wenger c0857dcb3f Add missing return statement 2018-10-24 15:19:01 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 2ecec5b344 Merged in feature/use-role-for-room-creation (pull request #7) 
Prevent students from adding new rooms, Verify room form

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-24 13:06:45 +00:00
Ramon Wenger 41e8aac63c Clean up code 2018-10-24 15:02:25 +02:00
Ramon Wenger 2dae1dfb0b Add basic rooms page tests 2018-10-24 14:36:42 +02:00
Ramon Wenger 4abf899222 Refactor login test to command 2018-10-24 14:33:46 +02:00
Christian Cueni e832f60cfb Hide Task checkbox in roomentry form 2018-10-24 13:04:49 +02:00
Christian Cueni 1591095553 Prevent students from adding new rooms, Verify room form 2018-10-24 08:40:30 +02:00
Ramon Wenger 4f76d56b19 Add cypress test runner and some initial e2e tests 2018-10-23 13:39:46 +02:00
Ramon Wenger aa85c152dd Use module teaser image as background image 2018-10-23 13:34:55 +02:00
Ramon Wenger 82417a5a7a Add hero image to module detail component 2018-10-23 12:47:31 +02:00
Christian Cueni f3db3c6657 Remove logout from user widget, Fix missing user in article header 2018-10-23 10:20:22 +02:00
Christian Cueni 2dcfa78a3f Change ObjectiveGroupControl background color 2018-10-23 09:34:33 +02:00
Ramon Wenger ff5aeaddee Simplify regex 2018-10-23 08:22:48 +02:00
Christian Cueni 93ad822457 Add logout functionality 
Remove unused imports

Add file header

Check response

remove file headers
 2018-10-23 08:20:25 +02:00
Ramon Wenger 867dc72abd Add Youtube short URLs 2018-10-23 08:05:42 +02:00
Ramon Wenger 11464c3014 Clean up code 2018-10-22 20:36:02 +02:00
Ramon Wenger 51cebfa34a Fix content block refresh bug 2018-10-22 20:34:42 +02:00
Ramon Wenger 40f11914fb Add bullet points 2018-10-22 20:17:17 +02:00
Christian Cueni 033372848e Merged in feature/detailpage (pull request #5) 
Feature/detailpage

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-22 17:22:38 +00:00
Christian Cueni 2d52a5b13d Fix broken css expression 2018-10-22 13:56:23 +02:00
Christian Cueni 390a387a56 Remove unused scss 2018-10-22 13:33:47 +02:00
Christian Cueni 8da1d63b42 Add link to document 2018-10-22 13:33:47 +02:00
Christian Cueni d7aa98e3e3 Add basic pages & queries for single submissions 2018-10-22 13:33:47 +02:00
Ramon Wenger 7a73545d8a Mark top navigation links as active on module pages 2018-10-21 20:44:54 +02:00
Ramon Wenger e1ac0e696f Add primary class to save button 2018-10-20 12:48:37 +02:00
Ramon Wenger cbf82d3b4c Remove inactive topics 2018-10-20 12:46:46 +02:00
Ramon Wenger a410f74764 Fix grid layout 2018-10-20 12:44:49 +02:00
Ramon Wenger 56e59ecf0b Hide results for students 2018-10-19 11:23:26 +02:00
Ramon Wenger a7141c3ea0 Add topic slug to route params 2018-10-19 11:04:05 +02:00
Ramon Wenger 2e4255260b Add hero image to module teasers 2018-10-19 10:57:07 +02:00
Ramon Wenger febed9adc4 Fetch topic information from API 2018-10-19 10:36:31 +02:00
Christian Cueni 622365bfbd Use same find methods 2018-10-18 16:59:28 +02:00
Christian Cueni 7a2f8c91e4 Filter user created blocks based on classes 2018-10-18 16:59:28 +02:00
Ramon Wenger eef657e318 Fix layout 2018-10-18 09:50:11 +02:00
Ramon Wenger 6212e6bb94 Make filter bar sticky 2018-10-17 16:44:42 +02:00
Ramon Wenger 387a403565 Adjust color of user widget 2018-10-17 16:25:45 +02:00
Ramon Wenger 7e88642918 Remove order property from module 2018-10-17 15:48:14 +02:00
Ramon Wenger 100fd19165 Hide room popover 2018-10-17 15:32:15 +02:00
Christian Cueni 13a9812ba0 Merged in feature/colors (pull request #3) 
Feature/colors

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-17 12:34:16 +00:00
Ramon Wenger e0aa2911ab Fix module navigation 2018-10-17 09:42:11 +02:00
Ramon Wenger 1faa75fdba Hide visibility popover on click outside of element 2018-10-17 09:36:12 +02:00
Ramon Wenger c81c7675b6 Add links to landing page 2018-10-16 18:17:14 +02:00
Christian Cueni 0db89c116d style checkbox, refactor task assignment 2018-10-16 15:28:18 +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
Christian Cueni 78f142e2da fix missing objectives 2018-10-15 14:09:56 +02:00
Ramon Wenger 72cab13b36 Add default users 2018-10-15 13:54:34 +02:00
Ramon Wenger 74f25850f1 Remove debug information 2018-10-11 16:14:48 +02:00
Ramon Wenger 6772aba1c9 Make image blocks work 2018-10-11 16:07:02 +02:00
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +02:00
Christian Cueni cf01aa2bf9 add missing variables to update, remove confusing class name 🤯 2018-10-11 15:08:35 +02:00
Christian Cueni 5dd77eab5d use cache for update, incorperate feedback 2018-10-11 14:12:47 +02:00
Ramon Wenger 3d0c9e4b93 Render room entry dynamically on article view 2018-10-11 14:09:09 +02:00
Ramon Wenger a4954b4e82 Remove sandbox folder 2018-10-11 13:46:12 +02:00
Ramon Wenger ce86e45743 Add content block deletion mutation 2018-10-11 11:39:50 +02:00
Christian Cueni 5970ac3427 update objective progress items 2018-10-10 10:45:56 +02:00
Ramon Wenger 645c998d5c Add 'user created' property on user created content blocks 2018-10-10 10:34:30 +02:00
Ramon Wenger 8110ee359f Distinguish between default and user created content blocks in cms admin 2018-10-09 17:42:19 +02:00
Christian Cueni 3369d0fbb7 add blank layout 2018-10-09 10:22:54 +02:00
Christian Cueni 6d988d3a5c Merge branch 'master' of bitbucket.org:iterativ/skillbox 2018-10-09 09:57:35 +02:00
Christian Cueni e602cd8a8d add start page 2018-10-09 09:57:10 +02:00
Ramon Wenger c56cfb8c19 Add user icon to user widget 2018-10-08 17:42:52 +02:00
Ramon Wenger ace485bca2 Move assignment with submissions to own component 2018-10-08 16:56:25 +02:00
Ramon Wenger f75b04b82f Add active state on submissions link 2018-10-08 16:55:39 +02:00
Ramon Wenger 26d3479871 Add title to assignment view 
Also, make route changes work smoothly
 2018-10-08 16:00:32 +02:00
Ramon Wenger 6e75b55475 Improve navigation styling 2018-10-08 15:32:25 +02:00
Ramon Wenger 3be07c471c Add submissions query to submissions page 2018-10-08 15:05:59 +02:00
Ramon Wenger b1e44ef263 Rename rooms query 2018-10-08 14:34:56 +02:00
Ramon Wenger 2adfffd441 Add role to user query 2018-10-08 11:34:04 +02:00
Ramon Wenger d970f75fa4 Refactor school class naming 2018-10-08 10:52:55 +02:00
Daniel Egger 85cc99470e Fixed case problem in filename for gql imports 2018-10-06 23:23:00 +02:00