Commit Graph

1006 Commits

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