Commit Graph

430 Commits

Author SHA1 Message Date
Ramon Wenger 3fd9aa1f31 Add helper function 2019-09-11 11:41:34 +02:00
Ramon Wenger b2e133542c Fix cypress test 2019-09-09 16:00:35 +02:00
Ramon Wenger b1a87cb08b Fix unit tests 2019-09-09 15:34:13 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 2af5749311 Add module reference to survey 2019-09-09 14:03:04 +02:00
Ramon Wenger 9e4784e5d8 Add helper functions to find the teacher of a user 2019-09-09 14:01:58 +02:00
Ramon Wenger 2efe682d7e Refactor dummy data 2019-09-05 14:44:46 +02:00
Ramon Wenger 75ba289100 Upate school class definion to not require a user when creating one 2019-09-04 16:12:15 +02:00
Ramon Wenger 4d2b354bc0 Add command for adding teachers 2019-09-04 16:08:41 +02:00
Ramon Wenger 695f6a016c Assign a role to students during import 2019-09-04 15:17:26 +02:00
Ramon Wenger 6020da8598 Add action menu and delete method to objectives 2019-08-26 11:15:25 +02:00
Ramon Wenger 6d5fa1806d Enable teachers to add new objectives instead of objective groups 2019-08-22 19:01:26 +02:00
Ramon Wenger 76b3f70a87 Hide single objectives instead of whole groups 2019-08-21 16:26:51 +02:00
Christian Cueni 3ae39cefce Handle missing attribute exception 2019-08-15 14:48:18 +02:00
Christian Cueni a81e211789 Fix nested modlue slug 2019-08-15 14:27:58 +02:00
Christian Cueni 1b47e5b837 Fix error when publishing page 2019-08-15 11:51:45 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8e0f9fd377 Support dicts in page update 2019-08-14 11:52:44 +02:00
Christian Cueni b0ae5a7cf1 Use titleslug model for admin slug 2019-08-14 11:52:44 +02:00
Christian Cueni 083a8b03a8 Add admin slug model 2019-08-14 11:52:44 +02:00
Ramon Wenger c9df7354fb Replace old logo with new one 2019-07-31 13:39:17 +02:00
Ramon Wenger bdfd6ee510 Change the content block type only if the user specifies a type 2019-07-29 11:22:00 +02:00
Ramon Wenger 63b235de41 Add random password to imported users 2019-07-25 14:57:39 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Christian Cueni 0af01b4a48 Add mutation test 2019-07-25 11:43:51 +02:00
Christian Cueni 91967ceb21 Add mutations and query, fix popover 2019-07-25 11:43:51 +02:00
Ramon Wenger c81bcbd26b Add survey block to content block in back- and frontend 2019-07-24 14:23:27 +02:00
Ramon Wenger 648a3e9229 Fix survey cypress test 2019-07-23 12:05:16 +02:00
Ramon Wenger f78a837bc0 Change more text 2019-07-22 11:48:40 +02:00
Ramon Wenger bc76882318 Add missing migrations 2019-07-22 11:33:41 +02:00
Ramon Wenger 89fbf18637 Tweak import script 2019-07-22 11:04:57 +02:00
Ramon Wenger f9786d3ed6 Change text to be more formal 2019-07-22 10:49:13 +02:00
Christian Cueni 4d177ac4d6 Fix wrong url 2019-07-17 20:08:40 +02:00
Christian Cueni a1234f6688 Merged in feature/nested-block (pull request #26)
Feature/nested block

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-17 15:14:57 +00:00
Ramon Wenger ba6b80dfdc Merged in feature/instrument-overview (pull request #25)
Feature/instrument overview

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-17 11:10:24 +00:00
Christian Cueni 599344e4be Augment fields in content list item 2019-07-17 11:33:20 +02:00
Christian Cueni c476485685 Merged in feature/set-password (pull request #24)
Feature/set password

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-17 09:31:26 +00:00
Christian Cueni 5226cb3574 Update copy 2019-07-17 11:06:44 +02:00
Ramon Wenger 2a4cf56825 Refactor some more occurences of basic knowledge to instrument 2019-07-17 09:54:34 +02:00
Christian Cueni e474618a4c Update copy, update urls 2019-07-17 07:46:29 +02:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Christian Cueni 334684a1db Add set password pages 2019-07-16 14:09:42 +02:00
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