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

1296 Commits

Author SHA1 Message Date
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