Commit Graph

1122 Commits

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