Commit Graph

1058 Commits

Author SHA1 Message Date
Daniel Egger 98a4ae2000 Update README 2023-05-26 10:13:17 +02:00
Daniel Egger ae6db9382a Refactor bitbucket pipelines for more reusability 2023-05-26 10:13:17 +02:00
Elia Bieri c75c9d0b40 Merged in feature/VBV-297-trainer-landet-direkt-in-cockpit (pull request #99)
Trainer landet direkt in cockpit

Approved-by: Daniel Egger
2023-05-26 07:58:21 +00:00
Daniel Egger 6368188d2f Rename back to `get_frontend_url` 2023-05-26 09:45:36 +02:00
Daniel Egger f33433b77d Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit 2023-05-26 09:39:44 +02:00
Christian Cueni 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
Christian Cueni 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
Daniel Egger 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
Elia Bieri ba813ca80b Merged in bugfix/typo_bitbucket_pipelines (pull request #104)
Fix typo in bitbucket_pipelines.yml

* Fix typo
2023-05-25 13:27:42 +00:00
Elia Bieri 6fd4ca2f11 Merged in feature/deploy_dev_on_develop_commits (pull request #103)
Deploy dev on commits to develop branch
2023-05-25 13:11:57 +00:00
Elia Bieri 3e3044b586 Deploy dev on commits on develop branch 2023-05-25 15:04:02 +02:00
Christian Cueni dcb5e0a8ab Merged in feature/VBV-384-remove-uk-duration (pull request #98)
Set duration default to 0, hide duration info if 0

Approved-by: Elia Bieri
2023-05-25 12:47:50 +00:00
Christian Cueni 0c06a169bc Use v-if 2023-05-25 14:39:20 +02:00
Elia Bieri 827a074ffb Fix caprover deploy 2023-05-25 14:16:43 +02:00
Elia Bieri ace5b5b21c Fix JS tests 2023-05-25 14:08:53 +02:00
Elia Bieri f5e367d467 Fix typecheck 2023-05-25 13:40:00 +02:00
Elia Bieri db35a037eb Jump to cockpit for trainers and superusers 2023-05-25 13:34:23 +02:00
Christian Cueni abefe878da Set duration default to 0, hide duration info if 0 2023-05-25 11:57:01 +02:00
Elia Bieri 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
Christian Cueni 0174126e18 Merged in feature/VBV-383-sso-language (pull request #97)
Add language parameter to SSO
2023-05-25 09:06:27 +00:00
Christian Cueni 6816ad8388 Add language parameter to SSO 2023-05-25 09:08:31 +02:00
Daniel Egger b7cca35e88 Merge migrations 2023-05-24 16:02:29 +02:00
Daniel Egger 3293e7bb45 Use title 2023-05-24 15:23:04 +02:00
Daniel Egger eebb37f42b Fix cypress test 2023-05-24 15:20:49 +02:00
Daniel Egger b65958bc0f Rename cypress describe text to match error text in pipelines 2023-05-24 15:20:49 +02:00
Daniel Egger 321c57b709 Make assignment creation more generic 2023-05-24 15:20:49 +02:00
Daniel Egger 0f0d1632a7 VBV-279: Inhaltstyp Reflexion 2023-05-24 15:20:47 +02:00
Daniel Egger b1d14fd691 Fix tests 2023-05-24 15:20:30 +02:00
Daniel Egger 8743441e81 Format code 2023-05-24 15:20:30 +02:00
Daniel Egger 9b5516a1bf Show correct badge vor "Vorbereitungsauftrag" 2023-05-24 15:20:28 +02:00
Daniel Egger de320be3cb Provide LearningContent to badge logic 2023-05-24 15:19:52 +02:00
Daniel Egger 9be0ce9d39 Frontend: "Vorbereitungsauftrag" 2023-05-24 15:19:49 +02:00
Daniel Egger 951d9b42e6 Add text for "Vorbereitunsauftrag" 2023-05-24 15:19:10 +02:00
Elia Bieri bd22189f9b Merged in feature/VBV-346-inhaltsyp-präsenzkurs-anpassen (pull request #92)
Inhaltsyp Präsenzkurs anpassen

Approved-by: Daniel Egger
2023-05-24 13:17:27 +00:00
Christian Cueni 3a6a143b7c Fix type, remove FAQ from footer 2023-05-24 14:51:02 +02:00
Christian Cueni a7986085ba Add fake "no events" text 2023-05-24 14:46:12 +02:00
Christian Cueni fac1f53f29 Fix footer, add it 2023-05-24 13:37:24 +02:00
Elia Bieri 322077ec82 Rework CircleOverview modal 2023-05-24 11:24:18 +02:00
Christian Cueni b2e9873666 Show plural of "Benachrichtigung" 2023-05-24 08:14:03 +02:00
Christian Cueni 5e01de2d72 Remove fake profile 2023-05-24 07:29:40 +02:00
Elia Bieri 1d0b956b56 Update features of course goals rich text field 2023-05-23 17:30:04 +02:00
Elia Bieri 100e42bdd2 Reformat code 2023-05-23 16:43:24 +02:00
Elia Bieri 09dcfcc418 Implement additional fields 2023-05-23 16:43:18 +02:00
Daniel Egger 86a9300e78 Merged develop into feature/VBV-318-dashboard 2023-05-23 13:37:34 +00:00
Elia Bieri b7cdc0ddde Add attendance course start- and endtime 2023-05-23 15:35:19 +02:00
Elia Bieri 132c115e8b Rename attendance days to attendance courses 2023-05-23 15:34:59 +02:00
Christian Cueni 7112a0e638 Merged in feature/VBV-373-lk-wording (pull request #91)
Update LK wording
2023-05-22 13:20:29 +00:00
Christian Cueni 03fd182edb Update LK wording 2023-05-22 14:24:14 +02:00
Christian Cueni 7e1bfffac1 Remove fake content 2023-05-22 12:57:25 +02:00
Daniel Egger 51eb358a43 Merged in feature/VBV-338-mediathek (pull request #89)
Feature/VBV-338 mediathek

Approved-by: Christian Cueni
2023-05-22 07:03:35 +00:00