ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
2,992 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

1082 Commits

Author SHA1 Message Date
Ramon Wenger 5ead2c9af6 Fix some minor issues on instrument overview for myKV 2022-10-06 12:15:45 +02:00
Ramon Wenger 51cfef5e40 Re-add failing tests 2022-10-05 20:12:19 +02:00
Ramon Wenger 35c7da24b2 Disable failing tests temporarily 2022-10-05 15:33:12 +02:00
Ramon Wenger 6c2f414dc0 Add failing test 2022-10-04 17:14:13 +02:00
Ramon Wenger 4489a8dcf8 Handle contents not editable by users on the server 
Relates to MS-589
 2022-10-04 17:11:03 +02:00
Ramon Wenger a45cdad652 Restore correct order of objectives 2022-10-03 13:46:20 +02:00
Ramon Wenger d844530095 Add copy of content block before the orignal 2022-09-29 16:40:10 +02:00
Ramon Wenger 4693d2c01a Add duplicate action to frontend 2022-09-29 16:40:10 +02:00
Ramon Wenger 6be6ab8092 Add mutation and unit test for duplication 2022-09-29 16:40:10 +02:00
Ramon Wenger d42007a5fc Fix dummy data 2022-09-15 17:52:16 +02:00
Ramon Wenger 6523c11915 Fix unit tests 2022-09-15 17:48:14 +02:00
Ramon Wenger 37e4461a22 Add category information to instrument queries 2022-09-15 16:04:37 +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 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 ac972c7196 Update instrument schema 2022-09-13 16:23:15 +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 d96a8c7b11 Add document to solution, add more generic document block 2022-09-07 08:41:06 +02:00
Ramon Wenger b244c7349d Increase test license duration for MyKV 2022-09-01 15:44:24 +02:00
Ramon Wenger 113995b520 Fix student submission page error 2022-08-22 21:12:25 +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 4d13d5e42d Add custom Document Model (No migration) 2022-07-28 15:56:58 +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
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 c679f84236 Add cms-document-block to api and frontend 2022-07-25 18:24:34 +02:00
Lorenz Padberg 47ff1192b4 Apply comments / recommendations of pullrequest 2022-07-25 16:43:30 +02:00
Lorenz Padberg 08970ff780 Add cms_block to uitls mutations 2022-07-25 16:32:06 +02:00
Lorenz Padberg fde57dd900 added survey menu to cms 2022-07-18 15:16:29 +02:00
Lorenz Padberg c1f8a18c8f removed dead code... added sorting 2022-07-18 14:14:41 +02:00
Ramon Wenger 46c5557fe5 Set the default wagtail search backend explicitly 
Resolves MS-544
 2022-07-15 17:56:25 +02:00
Ramon Wenger c7cf52c33f Fix faulty default value declaration for ISBN of licenses 2022-07-15 17:52:03 +02:00
Lorenz Padberg aaee137c07 removed page title explore 2022-07-14 17:03:27 +02:00
Lorenz Padberg 25a0f7fc26 refactoring 2022-07-14 17:02:52 +02:00
Lorenz Padberg e9e0e96357 Added inhaltsbloecke to chapter navigation 2022-07-14 17:01:09 +02:00
Lorenz Padberg 2d36f8a131 experiements with admintemplates 2022-07-14 13:53:07 +02:00
Lorenz Padberg 7bb3e06903 added meta_title to display in cms 2022-07-14 11:40:04 +02:00
Lorenz Padberg 7c959fd018 added document chooser block for wagtail documents 2022-07-12 13:51:31 +02:00
Lorenz Padberg 0dbc7ba8c4 added document urls to wagtail. URLS config (fixes 500 error) 2022-07-12 13:38:11 +02:00
Ramon Wenger e296191707 Add missing migrations 2022-07-12 13:11:42 +02:00
Lorenz Padberg 1d4fb2b956 added search to surveys in snippets 2022-07-12 11:20:39 +02:00
Lorenz Padberg f92ddcbc50 added search to assignments 2022-07-12 11:02:13 +02:00
Ramon Wenger 0aa60c5853 Add confirm dialog and custom text to room and room entry delete actions 
Resolves MS-524
 2022-07-11 16:34:33 +02:00
Ramon Wenger ff7e5ad1f6 Merged in feature/rooms-updated-edit-fields-MS-486-MS-487 (pull request #111) 
Feature/rooms updated edit fields MS-486 MS 487

Approved-by: Lorenz Padberg
 2022-07-11 13:26:51 +00:00
Ramon Wenger 1780893da2 Refine filters for RoomEntry admin 2022-07-07 16:12:12 +02:00
Ramon Wenger 8a83496307 Refine list filter and search fields for room admin 2022-07-07 16:09:11 +02:00
Ramon Wenger b0591d9c7e Adjust permissions, add unit tests 2022-07-06 17:48:29 +02:00
Ramon Wenger a01efaa558 Add data migration for new category 
Resolves MS-537
 2022-06-30 14:55:40 +02:00
Ramon Wenger 0eba96fd5e Make the student submissions changeable by any teacher 
Resolves MS-520
 2022-06-29 16:40:10 +02:00
Ramon Wenger 866e6f718c Update delete mutation signature 2022-06-28 12:30:47 +02:00
Ramon Wenger f2f7d30959 Add subtitle block to room entry contents 
Resolves MS-487
 2022-06-28 11:22:04 +02:00
Ramon Wenger 1fe1dbe92d Fix unit test 2022-06-27 17:01:09 +02:00
Ramon Wenger a81bb0e1e8 Add new edit page for room entries 
Also use slug instead of id to identify room entries
 2022-06-27 11:29:01 +02:00
Ramon Wenger cc28a44c6a Update schema 2022-06-23 16:07:02 +02:00
Ramon Wenger a89bf06c53 Update unit test, re-enable cypress tests 2022-06-23 15:42:46 +02:00
Ramon Wenger 14319a0ca8 Update save method to work on new room entry page 2022-06-23 15:35:31 +02:00
Ramon Wenger 0b70537241 Resolve migration conflict, add missing migration 2022-06-23 12:08:34 +02:00
Ramon Wenger d458790117 Move save method from modal to new page 2022-06-23 11:31:56 +02:00
Ramon Wenger 2fbd878387 Merged in feature/cms-improvements-ms-517-ms-518-ms-519 (pull request #108) 
Feature/cms improvements ms 517 ms 518 ms 519

Approved-by: Daniel Egger
 2022-06-22 15:07:49 +00:00
Ramon Wenger a2b62c4c25 Merge branch 'hotfix/visible-student-submissions' into develop 2022-06-21 17:01:33 +02:00
Ramon Wenger c0806d6b82 Fix query for users in same school class 
Now only queries for the active school class instead of all school
classes
 2022-06-21 16:42:27 +02:00
Ramon Wenger 34afbbe1be Change assignment text widget to be rich text 
Resolves MS-518
 2022-06-15 17:41:57 +02:00
Ramon Wenger dddce52150 Add bold style to default rich text editor features 2022-06-15 17:41:21 +02:00
Ramon Wenger 9f86b3c685 Update schema 2022-06-14 14:38:41 +02:00
Ramon Wenger 0d7b948e44 Fix unit tests 2022-06-14 14:33:17 +02:00
Ramon Wenger e5641b7f93 Update unit test and add mutation 2022-06-14 11:27:32 +02:00
Ramon Wenger 14b2905470 Fix failing test 2022-06-13 15:51:53 +02:00
Ramon Wenger 22460fcf28 Update unit tests 2022-06-13 15:37:15 +02:00
Ramon Wenger af7dfad9c1 Add new types file 2022-05-25 21:56:19 +02:00
Ramon Wenger b12d1c1a9f Add mutation to update a snapshot 2022-05-25 21:55:55 +02:00
Ramon Wenger 1f7ff13a13 Add unit tests for new features 2022-05-25 21:55:17 +02:00
Ramon Wenger 2fe7a684c5 Update base client usage 2022-05-25 21:53:49 +02:00
Ramon Wenger 5069c5b5ec Add new field on snapshot, add migration 2022-05-24 22:49:16 +02:00
Ramon Wenger 7da52b03a1 Merged in feature/topic-404 (pull request #106) 
Feature/topic 404

Approved-by: Christian Cueni
 2022-05-23 18:21:37 +00:00
Ramon Wenger ae4fec5603 Remove unused code 2022-05-23 20:18:29 +02:00
Ramon Wenger 102b341920 Add filter to export 2022-05-23 12:41:18 +02:00
Ramon Wenger ce9d58ad5c Add unit test 2022-05-19 18:33:45 +02:00