Commit Graph

353 Commits

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