Commit Graph

388 Commits

Author SHA1 Message Date
Christian Cueni 2905486c2f Remove content list in wagtail, add content list in frontend 2019-07-16 09:36:43 +02:00
Ramon Wenger 87b66336e6 Strip whitespace during import 2019-07-15 14:48:28 +02:00
Christian Cueni 036c53dd9f Add content list block 2019-07-15 12:59:00 +02:00
Christian Cueni fd4a9d2e18 Add content list 2019-07-15 12:56:47 +02:00
Christian Cueni 229ab6b0e6 Add subtitle to instruments 2019-07-11 16:01:01 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 03d8ed6712 Add subtitle block, update font sizes 2019-07-11 10:41:55 +02:00
Christian Cueni b50a489e7d Update password reset text, add sender name in email 2019-07-11 08:27:18 +02:00
Ramon Wenger 24460fcee4 Change 'username' to 'email' in login form 2019-07-10 16:36:51 +02:00
Ramon Wenger a09bf2786d Save correct answer with answer given by user 2019-07-08 15:10:33 +02:00
Ramon Wenger 25856aa647 Clean up migrations 2019-07-04 14:53:06 +02:00
Ramon Wenger 9dca627465 Merged in feature/surveyjs (pull request #17)
Feature/surveyjs
2019-07-04 11:31:12 +00:00
Ramon Wenger be076f1550 Merged in feature/user-import (pull request #18)
Feature/user import
2019-07-04 11:29:34 +00:00
Ramon Wenger e296d500aa Clean up code 2019-07-04 10:24:12 +02:00
Ramon Wenger 7ca7dbe4dd Add school classes to admin view 2019-07-04 10:18:23 +02:00
Christian Cueni 621424567a Enable password reset, add sendgrid to pipfile 2019-07-03 14:48:52 +02:00
Ramon Wenger 0c86c8ec1b Add test for import 2019-07-03 14:12:05 +02:00
Ramon Wenger e062a533b1 Add command for importing users 2019-07-03 13:03:33 +02:00
Ramon Wenger 7d46ec9ef0 Make school class name unique 2019-07-03 11:59:31 +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 9b85560795 Add answers to surveys 2019-06-27 17:56:29 +02:00
Ramon Wenger 4696ed239e Remove required description on instrument block 2019-06-24 16:12:31 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger c57e75cf21 Add missing migration 2019-06-24 13:22:27 +02:00
Ramon Wenger c9caaf79db Add initial implementation of survey model 2019-06-20 14:51:43 +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 016f6ce502 Enable editing of content blocks with assignments 2019-05-21 15:15:38 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Ramon Wenger 2a6d2fe693 Add document block to room entry 2019-05-07 16:17:33 +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 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
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 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +02:00
Christian Cueni fa98141f3c add myActivity query 2019-04-11 10:12:15 +02:00
Christian Cueni f8c1f372cb merge develop into feature/pw-reset 2019-04-11 08:14:08 +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
Christian Cueni 8b53d2fa7e add my schoolclasses query, fix test 2019-04-09 11:27:30 +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 e9895d9f74 Merged in feature/testing (pull request #12)
restrict access to users and rooms, add tests

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-04-08 09:05:37 +00:00
Christian Cueni e3575bcf97 Handle backenderrors in frontend 2019-04-04 15:57:02 +02:00
Christian Cueni d64c641661 Add pw change endpoint in API 2019-04-03 15:53:00 +02:00
Ramon Wenger ba436f8186 Fix os.environ call 2019-03-29 16:45:43 +01:00
Ramon Wenger 47572bb212 Add new tests for projects 2019-03-29 16:37:48 +01:00
Ramon Wenger 5b83b04a0a Add coverage 2019-03-29 16:36:41 +01:00
Christian Cueni aeded87227 Add permissions to objectivegroup mutations 2019-03-28 14:55:32 +01:00
Christian Cueni 43f942ea2d protect updates on room entries, add tests 2019-03-28 11:31:02 +01:00
Christian Cueni ab6b1d76be add missing settings to test configuration 2019-03-27 16:02:28 +01:00
Christian Cueni d03524e803 add entry count to project widget 2019-03-27 15:56:27 +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
Christian Cueni ba1e63a84b restrict access to users and rooms, add tests 2019-03-14 12:12:31 +01:00
Ramon Wenger 262a2b8cef Add project entry model and endpoints to backend 2019-03-13 17:50:29 +01:00
Ramon Wenger 34ad9927a7 Fix unit tests 2019-03-12 14:06:47 +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 a233c02049 Replace old favicon with transparent one 2019-03-11 15:38:39 +01:00
Christian Cueni 319725ae57 Merge branch 'feature/pw-reset' into develop 2019-03-07 11:34:20 +01:00
Christian Cueni d3edbae71a remove English text in email 2019-03-07 11:19:31 +01:00
Ramon Wenger 485a6ca4eb Add portfolio backend 2019-03-07 10:49:52 +01:00
Christian Cueni 71ec25028e add i18n to login 2019-03-06 09:59:32 +01:00
Christian Cueni 670fecd35f add templates for password reset 2019-03-06 09:54:13 +01:00
Ramon Wenger 9acfc8f041 Add favicon 2019-03-05 17:56:25 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +01:00
Ramon Wenger 4f72f804c6 Add genial.ly block 2019-02-21 09:55:41 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 9cf9fdcbec Add commands to hide all solutions for testing purposes 2019-02-14 18:49:28 +01:00
Ramon Wenger e7d1acbb5c Display solutions for admins 2019-02-13 16:34:39 +01:00
Ramon Wenger 3b6284e753 Add solution to assignment model 2019-02-13 16:21:00 +01:00
Ramon Wenger 0b75e14393 Move solution check to utils 2019-02-13 16:20:29 +01:00
Ramon Wenger 84324f9f7c Remove inserted errors again 2019-02-13 14:04:10 +01:00
Ramon Wenger 2e38a03bfa Divide by zero for an uncaught error 2019-02-13 13:56:43 +01:00
Ramon Wenger 627a012efe Remove divide by zero error 2019-02-13 13:46:39 +01:00
Ramon Wenger 8eb9735640 Break rooms to test sentry logging 2019-02-13 13:37:47 +01:00
Ramon Wenger a3a0874c65 Add new sentry SDK 2019-02-13 13:36:41 +01:00
Ramon Wenger 5a77a3dd12 Add missing statistics 2019-02-11 18:02:58 +01:00
Ramon Wenger 89961dc301 Add statistics basics 2019-02-10 22:54:34 +01:00
Ramon Wenger e9bee08c1d Add statistics module 2019-02-10 18:04:07 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger 4b93b410a5 Add mutation to enable solutions by module 2019-02-05 18:45:03 +01:00
Ramon Wenger a08be83283 Add styling to solution 2019-02-04 18:09:51 +01:00
Ramon Wenger 92d2901f9e Add solution type to server 2019-02-04 15:19:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 460d413196 Add owner to form for assignment creation 2018-12-05 18:13:31 +01:00
Ramon Wenger f235d50424 Add assignment as a snippet 2018-12-05 15:07:25 +01:00
Ramon Wenger ca96676e5c Add assignments to cms admin 2018-12-04 16:23:50 +01:00
Ramon Wenger 59efba9179 Filter content block by user created attribute 2018-12-04 13:32:11 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 7fd7728712 Add mutation to server 2018-11-21 14:57:36 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 876a22c4ad Adjust test to run on pipelines 2018-11-20 09:13:37 +01:00