Commit Graph

976 Commits

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