Commit Graph

390 Commits

Author SHA1 Message Date
Daniel Egger 8941f4ad24 Merge branch 'feature/mediathek-server' into feature/mediathek-frontend 2022-09-23 16:17:02 +02:00
Daniel Egger a7f0d79c0f Add serializer for media_library models 2022-09-23 15:38:06 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger 5425c1b22c Add content collections with create_default script 2022-09-23 14:55:21 +02:00
Daniel Egger f9c3e82b66 Adapt LearningPath to new course model 2022-09-23 14:55:21 +02:00
Daniel Egger ee4f6fb565 Add course app with default course model 2022-09-23 14:55:21 +02:00
Daniel Egger a75a29f57c Squashed commit of feature/Mediathek from Renzo
commit ac0707296df479c0de5399b8adcccc24da749810
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:39:01 2022 +0200

    Revert "Upgrade to Wagtail 4.0"

    This reverts commit e6f43f6b11e91a923badbaec33ab460a3cfac60e.

commit d5b28e362f604d17fed32fabe8295865b82350de
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:38:14 2022 +0200

    Add factories for category content

commit e6ebabc1c6b01ccbc14413bbe40e71a348dfa565
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Tue Sep 13 16:10:58 2022 +0200

    Simplify Mediathek models

commit b4dd179b891960babb8c26a70d3cecfcabb72264
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 15:53:00 2022 +0200

    Add Document and Link to Mediathek

commit 707ab8d9abc622f3ef5935472ddc7e7c74a352e6
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 14:16:49 2022 +0200

    Add Media Library Models, including factory and default data

commit e6f43f6b11e91a923badbaec33ab460a3cfac60e
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 11:09:46 2022 +0200

    Upgrade to Wagtail 4.0
2022-09-23 14:55:21 +02:00
Elia Bieri 722b9f7937 Merged in feature/vbv-148-human-readable-duration (pull request #8)
Implement human readable durations

* Implement duration formatting for humans

* Add UTs

* Rework rounding and formatting

* Rename function
2022-09-20 11:12:05 +00:00
Christian Cueni 442ee3e4da Add basic mediacenter store 2022-09-19 14:40:06 +02:00
Christian Cueni f7b0140eec Make grids mobile-ish 2022-09-19 14:40:06 +02:00
Christian Cueni 6d5823eb06 Add Dropdown to Mediathek 2022-09-19 14:40:06 +02:00
Christian Cueni c35b5cce70 Make DropdownSelect component 2022-09-19 14:40:06 +02:00
Christian Cueni 1a41fe4f10 WIP: Add "Alles zeigen" link 2022-09-19 14:40:06 +02:00
Christian Cueni d38e7eee38 WIP: Add media link component 2022-09-19 14:40:06 +02:00
Christian Cueni a198da395a Use layout for Handlungsfelder 2022-09-19 14:40:06 +02:00
Christian Cueni a0ea8a18a6 WIP: Add basic Handlungsfeld page 2022-09-19 14:40:06 +02:00
Christian Cueni 43c311145e Add basic styles to Handlungsfelder 2022-09-19 14:38:50 +02:00
Christian Cueni 070c79a0d9 WIP: Add icons to safelist 2022-09-19 14:38:50 +02:00
Christian Cueni 23f6c43352 WIP: Add OverviewCard 2022-09-19 14:38:50 +02:00
Christian Cueni 31eb779ce5 Add basic routing and container 2022-09-19 14:38:50 +02:00
Daniel Egger da13345511 Merge branch 'feature/vbv-88-learning-path-vertical' into develop 2022-09-15 07:56:38 +02:00
Daniel Egger d8959a8d0c Add total circle duration to circle view 2022-09-15 07:55:53 +02:00
Daniel Egger 18f87cbd5a fix flaky test 2022-09-14 18:43:33 +02:00
Daniel Egger 5663fe1a74 Try to make cypress tests less flaky 2022-09-14 16:29:41 +02:00
Daniel Egger b7eb88e4d5 Cypress tests 2022-09-14 15:52:44 +02:00
Daniel Egger a3171da28d Dynamic "Weiter gehts" "Leider gehts" 2022-09-14 15:52:44 +02:00
Daniel Egger edc0b3aeb2 Design Anpassungen 2022-09-14 15:52:44 +02:00
Daniel Egger 20a3de4d80 VBV-144: enable `hyphens: auto` on body tag 2022-09-14 15:52:44 +02:00
Daniel Egger 0c01d39fb3 VBV-88: LearningPathView vertical 2022-09-14 15:52:44 +02:00
Daniel Egger 384999619c Merge branch 'feature/learning-content-urls' into develop 2022-09-09 18:08:22 +02:00
Daniel Egger a57ef84ed8 VBV-80: Umgesetzt Circle-Ansicht "weiter gehts" 2022-09-09 18:06:38 +02:00
Daniel Egger 6b0cf9effd Refactor LearningContent routing 2022-09-09 17:47:27 +02:00
Daniel Egger dc5adb6214 Refactor SelfEvaluation to its own route 2022-09-09 16:57:39 +02:00
Daniel Egger 5d6e94ebd6 Refactor LearningContent to its own route 2022-09-09 16:15:08 +02:00
Daniel Egger 8dbec8b699 Use `runserver_plus` to minimize runserver cpu usage 2022-09-09 12:16:48 +02:00
Daniel Egger 48b143b99a Remove superfluous media files 2022-09-09 11:57:45 +02:00
Daniel Egger ac268907bf VBV-143: "git revision hash" und Build-Datum anzeigen 2022-09-09 11:56:51 +02:00
Daniel Egger 3ff2b23cf7 VBV-142: move "/media" to "/static/media" 2022-09-09 11:56:49 +02:00
Lorenz Padberg 9c24ede7ab Add player from scormcontent 2022-09-08 14:32:17 +02:00
Daniel Egger 1eec54d9d8 Fix cypress tests 2022-09-02 17:50:24 +02:00
Daniel Egger 2e59d2464c Add parent prefix to slugs 2022-09-02 17:42:14 +02:00
Daniel Egger d5f4b37cfe VBV-102: refactor server urls 2022-09-02 14:33:38 +02:00
Lorenz Padberg db01be1726 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop 2022-09-01 14:41:27 +02:00
Lorenz Padberg 4acf369d15 Add 1 git-crypt collaborator
New collaborators:

	31CDFAD1 Elia Bieri <elia.bieri@iterativ.ch>
2022-09-01 14:33:12 +02:00
Daniel Egger 26f373afe2 Add e2e test for "weiter gehts"-button 2022-08-31 18:36:10 +02:00
Daniel Egger a457a1fff3 Fix cypress tests 2022-08-31 15:32:35 +02:00
Daniel Egger 18acf10c9a Refactor to new url structure for learningPath and circle 2022-08-31 15:28:17 +02:00
Daniel Egger 0acdab60cd Add vitest tests to bitbucket pipelines 2022-08-31 13:42:22 +02:00
Daniel Egger 911b974360 Fix some typescript warnings 2022-08-31 12:23:05 +02:00
Daniel Egger 2316150375 Update `nextLearningContent` dynamically 2022-08-30 17:47:32 +02:00