Commit Graph

373 Commits

Author SHA1 Message Date
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
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
Daniel Egger a32c8ccbff VBV-80: Refactor next learning content 2022-08-30 17:34:29 +02:00
Daniel Egger 97f01e0a08 Refactor LearningPath class 2022-08-30 15:59:30 +02:00
Daniel Egger b404578926 Upgrade client libraries 2022-08-30 15:56:54 +02:00
Daniel Egger 26139304a3 Generate additional simple learningPath for development 2022-08-30 15:56:54 +02:00
Daniel Egger eaa06719d6 Update styleguide colors 2022-08-30 15:56:54 +02:00
Lorenz Padberg dd18cf895b Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop
# Conflicts:
#	client/src/views/LearningPathView.vue
2022-08-30 14:53:20 +02:00
Lorenz Padberg a2a027d1c8 Merge branch 'feature/weiter-gehts' into develop 2022-08-30 14:51:14 +02:00
Lorenz Padberg a560d86061 Add detetecion for last learning unit 2022-08-30 14:50:31 +02:00
Lorenz Padberg eceeff559a Added get last completed functionality 2022-08-30 13:51:05 +02:00
Lorenz Padberg 508cf4e967 Add Weiter gehts to learning path overview 2022-08-30 11:52:57 +02:00
Daniel Egger 8b79201ba6 Refactor color values to json file 2022-08-30 11:07:30 +02:00
Daniel Egger 13f1154a94 Access tailwind theme from within custom CSS 2022-08-29 18:30:56 +02:00
Daniel Egger b6751adea5 VBV-67: Circle Ansicht Design Anpassungen 2022-08-29 18:23:33 +02:00
Daniel Egger 919edf1a24 Add cypress tests for circle page 2022-08-29 16:22:31 +02:00
Daniel Egger 3189e1cb7f Add cypress tests for learningPath view 2022-08-29 14:10:55 +02:00
Daniel Egger 5875f13143 Merge branch 'feature/bitbucket-unit-tests' into develop 2022-08-26 18:20:03 +02:00
Daniel Egger 52632708db Make cypress tests run on bitbucket 2022-08-26 18:18:32 +02:00