Commit Graph

2902 Commits

Author SHA1 Message Date
Ramon Wenger bd87999487 Restore styling on instrument filters 2022-09-15 15:10:09 +02:00
Ramon Wenger ce5d8603ff Add translations for some models
Relates to MS-479
2022-09-14 16:40:27 +02:00
Ramon Wenger d787367020 Merged in feature/extended-instrument-categories (pull request #118)
Feature/extended instrument categories
2022-09-14 11:33:48 +00:00
Ramon Wenger bd2acdc7c6 Fix cypress test 2022-09-14 11:53:16 +02:00
Ramon Wenger 8d40c558f0 Fix unit test and cypress test 2022-09-13 20:40:48 +02:00
Ramon Wenger 76ee8bc8a8 Merged in feature/documents-in-solutions (pull request #117)
Feature/documents in solutions

Resolves MS-543 

Approved-by: Lorenz Padberg
2022-09-13 14:42:43 +00:00
Ramon Wenger 759cece268 Refactor code 2022-09-13 16:39:24 +02:00
Ramon Wenger b0a57abaa8 Update the admin view of the new models 2022-09-13 16:34:56 +02:00
Ramon Wenger 2b3f9c7ae0 Update filtering in client 2022-09-13 16:28:56 +02:00
Ramon Wenger ac972c7196 Update instrument schema 2022-09-13 16:23:15 +02:00
Ramon Wenger 3810932cac Replace old queries without subselection 2022-09-13 11:24:51 +02:00
Ramon Wenger d1c4d63179 Replace category string in instrument type with proper model 2022-09-13 11:23:51 +02:00
Ramon Wenger d172e9a005 Add instrument category model 2022-09-13 10:49:48 +02:00
Ramon Wenger ae3dfdd17f Add todo 2022-09-08 12:29:41 +02:00
Ramon Wenger 7fae655543 Add documents to client view 2022-09-08 12:28:37 +02:00
Ramon Wenger 269efed6ce Fix comment layout on article page 2022-09-07 14:41:01 +02:00
Ramon Wenger d96a8c7b11 Add document to solution, add more generic document block 2022-09-07 08:41:06 +02:00
Ramon Wenger 04aa7a2524 Make linter happy 2022-09-05 16:52:52 +02:00
Ramon Wenger e3f611a5eb Fix cache bug when changing school class 2022-09-05 16:49:15 +02:00
Ramon Wenger b244c7349d Increase test license duration for MyKV 2022-09-01 15:44:24 +02:00
Ramon Wenger c27fc9200b Merged in release/mobile-improvements-july-2022 (pull request #116)
Release/mobile improvements july 2022

Approved-by: Lorenz Padberg
2022-08-29 10:42:55 +00:00
Ramon Wenger 113995b520 Fix student submission page error 2022-08-22 21:12:25 +02:00
Lorenz Padberg 70ab28012b Fix jshint warning 2022-08-09 10:37:33 +02:00
Lorenz Padberg 2a10debbd0 Remove conflicting migration 2022-08-03 14:44:20 +02:00
Lorenz Padberg c432825aa8 Merge branch 'release/Wagtail-anpassungen' into develop
# Conflicts:
#	server/core/settings.py
#	server/users/migrations/0032_alter_license_isbn.py
2022-08-03 14:34:54 +02:00
Lorenz Padberg 8bba23745a Remove migration 2022-08-03 13:00:21 +02:00
Lorenz Padberg 88a9d98c0a Improve document not found error handling 2022-08-03 11:25:19 +02:00
Lorenz Padberg 21413b183a Merge branch 'feature/MS-540-use-custom-document-model' into release/Wagtail-anpassungen 2022-08-03 11:13:34 +02:00
Lorenz Padberg 78abe81f8f Add migration to custom document model 2022-08-03 11:13:08 +02:00
Lorenz Padberg ea67b8b64c Add migration function for custom document model 2022-08-03 11:03:42 +02:00
Lorenz Padberg cc9efd216b Show display_text property in frontend 2022-08-02 15:54:03 +02:00
Lorenz Padberg 71daea3479 Refactor core/views 2022-07-28 18:01:48 +02:00
Lorenz Padberg 8dd865ae97 Overwrite default sort ordering in CMS Pages overview 2022-07-28 17:57:20 +02:00
Lorenz Padberg bbaa5882e0 Filter out snapshot content blocks from CMS Explore view 2022-07-28 17:46:29 +02:00
Lorenz Padberg a299ac5bcd Fix bottom spacing cms_document block and image_block 2022-07-28 16:31:13 +02:00
Ramon Wenger 0d03e86360 Merged in feature/mobile-improvements-MS-534-MS-535-MS-525-MS-528-MS-529-MS-527 (pull request #113)
Feature/mobile improvements MS-534 MS 535 MS 525 MS 528 MS 529 MS 527

Approved-by: Lorenz Padberg
2022-07-28 13:57:11 +00:00
Lorenz Padberg 4d13d5e42d Add custom Document Model (No migration) 2022-07-28 15:56:58 +02:00
Ramon Wenger 68b2c94849 Remove unused code 2022-07-28 15:27:51 +02:00
Ramon Wenger d8fd531cda Merged in feature/refactor-submission-feedback (pull request #112)
Feature/refactor submission feedback

Approved-by: Lorenz Padberg
2022-07-28 13:16:37 +00:00
Ramon Wenger 2365d24c5c Fix automatic close of sidebar
Resolves MS-535
2022-07-27 17:52:44 +02:00
Lorenz Padberg 9fea218dd3 Add cms_document_block to Basic Knowlege page 2022-07-27 16:30:48 +02:00
Lorenz Padberg dc7c80fbd9 Remove list filter from Assignments and Survey pages 2022-07-27 16:30:13 +02:00
Lorenz Padberg 7a77ae6eb2 Remove user created content blocks from Chapter overview in CMS 2022-07-27 16:09:17 +02:00
Lorenz Padberg 0398c1bfc6 Add Status to Instruments List 2022-07-27 15:58:54 +02:00
Lorenz Padberg 9f7bd8b6b4 Add search to Instruments 2022-07-27 15:44:16 +02:00
Lorenz Padberg 5137955b54 Fix Ordering filter in pages list template 2022-07-27 15:16:52 +02:00
Lorenz Padberg 98393b046f Fix comment 2022-07-26 11:11:10 +02:00
Lorenz Padberg 3b7595db9d Merge branch 'feature/MS-540-Use-wagtail-documents' into release/Wagtail-anpassungen 2022-07-26 11:05:36 +02:00
Lorenz Padberg d7b2c36994 Merge branch 'feature/MS-539-Add-search' into release/Wagtail-anpassungen 2022-07-26 11:05:04 +02:00
Lorenz Padberg dd57e9c4da Fix html classes in cms-document-block 2022-07-26 11:03:45 +02:00