6d662626dc
Merged in feature/VBV-386-lerneinheiten-titel-entfernbar-machen (pull request #111 )
...
Add ability to hide learning unit titles
* Add ability to hide learning unit titles
# Conflicts:
# server/vbv_lernwelt/course/creators/uk_course.py
* Fix rebase
* Undo faulty rebase
Approved-by: Christian Cueni
2023-05-31 09:39:27 +00:00
1a0a431768
Merged in feature/VBV-370-dev-live-loginpage (pull request #114 )
...
Feature/VBV-370 Separate local and SSO login page
* Implement local and SSO login pages
* Add translations
* Fix typechecks
* Fix env detection
Approved-by: Christian Cueni
2023-05-31 06:55:00 +00:00
37e43158b4
Remove icon, fix json
2023-05-30 13:23:21 +02:00
64407a622e
Fix duration display
2023-05-29 07:44:50 +02:00
1fa420a11b
VBV-355: Inhaltstyp Test
2023-05-26 16:49:50 +02:00
2d58cdd9fe
Add code after rebase
2023-05-26 16:07:42 +02:00
9937951728
Wire document list to frontend
2023-05-26 16:07:42 +02:00
30cdd8c189
Remove overview nav
2023-05-26 15:30:30 +02:00
f8e309e424
Fix language switching
2023-05-26 14:37:51 +02:00
f33433b77d
Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit
2023-05-26 09:39:44 +02:00
3ae4dbdf8d
Merged in feature/VBV-379-ui-cleanup (pull request #94 )
...
Feature/VBV-379 ui cleanup
Approved-by: Daniel Egger
2023-05-26 06:57:54 +00:00
b58405f568
Merged in feature/VBV-318-dashboard (pull request #90 )
...
Remove fake content
Approved-by: Daniel Egger
2023-05-26 06:54:06 +00:00
4b06654954
Merged in feature/VBV-278-vorbereitungsauftrag (pull request #96 )
...
Feature/VBV-278 vorbereitungsauftrag
Approved-by: Elia Bieri
2023-05-25 16:31:41 +00:00
0c06a169bc
Use v-if
2023-05-25 14:39:20 +02:00
f5e367d467
Fix typecheck
2023-05-25 13:40:00 +02:00
db35a037eb
Jump to cockpit for trainers and superusers
2023-05-25 13:34:23 +02:00
abefe878da
Set duration default to 0, hide duration info if 0
2023-05-25 11:57:01 +02:00
1908665596
Merged in feature/VBV-377-umsetzung-das-lernst-du-in-diese (pull request #93 )
...
Umsetzung: das lernst du in diesem Circle
Approved-by: Christian Cueni
2023-05-25 09:47:25 +00:00
6816ad8388
Add language parameter to SSO
2023-05-25 09:08:31 +02:00
0f0d1632a7
VBV-279: Inhaltstyp Reflexion
2023-05-24 15:20:47 +02:00
de320be3cb
Provide LearningContent to badge logic
2023-05-24 15:19:52 +02:00
9be0ce9d39
Frontend: "Vorbereitungsauftrag"
2023-05-24 15:19:49 +02:00
a7986085ba
Add fake "no events" text
2023-05-24 14:46:12 +02:00
322077ec82
Rework CircleOverview modal
2023-05-24 11:24:18 +02:00
b2e9873666
Show plural of "Benachrichtigung"
2023-05-24 08:14:03 +02:00
5e01de2d72
Remove fake profile
2023-05-24 07:29:40 +02:00
09dcfcc418
Implement additional fields
2023-05-23 16:43:18 +02:00
b7cdc0ddde
Add attendance course start- and endtime
2023-05-23 15:35:19 +02:00
132c115e8b
Rename attendance days to attendance courses
2023-05-23 15:34:59 +02:00
7e1bfffac1
Remove fake content
2023-05-22 12:57:25 +02:00
bc368e7a2f
Fix cypress tests
2023-05-19 14:50:41 +02:00
4fb534aa25
Create `create_course_uk_de_completion_data` with algo
2023-05-19 14:05:14 +02:00
decba980f5
Rework Media Library
2023-05-19 10:17:25 +02:00
e8d6a9c784
Embed media library as course session specific page
2023-05-19 10:17:24 +02:00
a0593bbacd
Remove debug stuff
2023-05-19 10:02:35 +02:00
bcc42eaf83
Make `useCurrentCourseSession` reactive
2023-05-19 09:58:55 +02:00
8793b30b56
Add comments for documentation
2023-05-17 19:30:10 +02:00
2f9fbed8f5
Access courseSession by `useCurrentCourseSession`
2023-05-17 19:30:10 +02:00
518b8c2ad0
Merge branch 'develop' into feature/VBV-331-inhaltstyp-statischer-text
2023-05-17 19:11:37 +02:00
9e3124160a
Add some test data and clean up some things
2023-05-17 19:09:33 +02:00
4d614b10cc
Fix circle diagram text
2023-05-17 15:19:16 +02:00
849e49c433
Minor fixes
2023-05-17 13:42:16 +02:00
652cd7d8fb
Implement RichTextBlock
2023-05-17 10:59:21 +02:00
31dae0a5cd
VBV-306: Use GraphQL for assignment code
2023-05-15 19:07:06 +02:00
e130d65f37
Merged in feature/VBV-339-assignment-cypress-test (pull request #79 )
...
Feature/VBV-339 assignment cypress test UNFINISHED
* Create assignment submission test data for cypress test
* Add first assignment trainer test
* Add first cypress test which checks DB entry with all instrumentation
2023-05-12 14:33:14 +00:00
b313bad031
Rename field `type` to `content_type` in REST response
...
In Wagtail Grapple/GraphQL the field is already called `content_type`
2023-05-12 13:38:35 +02:00
a15af2bf86
VBV-350: Refactor LearningContent to individual wagtail pages
2023-05-12 11:51:02 +02:00
3858cdfc79
Merged in bugfix/auftrag_ui_test_rework (pull request #80 )
...
Auftrag UI Test rework
* UI test rework
* Fix cypress tests
2023-05-11 12:48:33 +00:00
f3c599c344
Merged in feature/strengthen_lint_rules (pull request #77 )
...
Strengthen lint rules
* Strengthen lint rules
* Fix linting errors
# Conflicts:
# client/src/components/learningPath/LearningPathDiagram.vue
# client/src/components/learningPath/LearningPathViewVertical.vue
* Add no-required-prop-with-default rule
# Conflicts:
# client/src/components/learningPath/LearningPathDiagram.vue
* Fix typechecks
* Reformat eslintrc
2023-05-11 09:52:10 +00:00
2e974dc323
Merged in bugfix/VBV-308-bereinigung-altes-lernpfad-diagramm (pull request #74 )
...
Cleanup old learn path diagrams
* Fix Safari mobile bug
* Initial cleanup
Approved-by: Daniel Egger
2023-05-11 07:50:20 +00:00
Elia Bieri
Christian Cueni
Daniel Egger
Daniel Egger