3e270e97ff
Add country ordering
2024-02-15 15:08:33 +01:00
8e7f69f296
Merge branch 'develop' into feat/vv-kompotenz-navi
2024-02-14 10:45:43 +01:00
4ab5df0753
Merged in feat/588-vv-fremdeinschatzung (pull request #277 )
...
Feat/588 - VV Mentor Fremdeinschätzung
Approved-by: Daniel Egger
2024-02-14 06:39:07 +00:00
cc96bb8a76
Merged develop into feat/588-vv-fremdeinschatzung
2024-02-14 06:26:24 +00:00
b5381caf3c
Merged in bugfix/VBV-642-lernbegleitung-lehrgang (pull request #287 )
...
fix: allow same mentor in different courses
Approved-by: Christian Cueni
2024-02-13 12:10:58 +00:00
29d8f30902
Merged develop into bugfix/VBV-642-lernbegleitung-lehrgang
2024-02-13 11:55:49 +00:00
a76e23743b
Merged in bugfix/VBV-644-trainer-vorschau-read-only (pull request #288 )
...
fix: allow learning content for trainers
Approved-by: Christian Cueni
2024-02-13 11:55:34 +00:00
b307c84db1
fix: allow learning content for trainers
...
Fixes #VBV-644
2024-02-13 12:19:20 +01:00
1540e9d62a
chore: migrate all VV learning units
...
so that their self evaluation pages show the ask for mentor feedback stuff
2024-02-12 22:13:42 +01:00
20bd103ab3
chore: simplify query
2024-02-12 22:12:16 +01:00
1065e8c2da
fix: uk mentor still needed for cypress reset :-/
...
- uk mentor, which does not really make sense but is still needed for cypress tests
- vv mentor, can't be added yet to the same user, see open PR https://bitbucket.org/iterativ/vbv_lernwelt/pull-requests/287
==> Once 287 is merged, we can add the vv mentor as well
2024-02-12 16:10:17 +01:00
a97e698165
fix: create_laerning_mentor for vv course
2024-02-12 15:28:22 +01:00
8008af0777
fix: format
2024-02-12 14:32:44 +01:00
c5197c6c70
chore: expose create_learning_mentor to django admin
2024-02-12 14:04:27 +01:00
0e5e311829
chore: use page suffix + smaller changes (pr feedback)
2024-02-12 13:28:48 +01:00
3625841d80
chore: naming, don't use fetch
2024-02-12 11:53:18 +01:00
731e4af960
chore: set vv student's ID
2024-02-12 11:52:52 +01:00
bfff7eff9d
fix: allow same mentor in different courses
2024-02-12 10:28:32 +01:00
b0c63b8a3e
Merged in fix/remove-twint-text (pull request #285 )
...
Revert "Add payment problems text"
2024-02-09 11:49:31 +00:00
7148651147
Revert "Add payment problems text"
...
This reverts commit 9a405b6900
2024-02-09 12:31:59 +01:00
2f3b3be493
fix: trying to enable console.log in cypress
2024-02-09 11:14:23 +01:00
b9bdb745ce
Merged in feature/VBV-641-vorschau-lernbegleitung (pull request #281 )
...
Vorschau Lernbegleitung
Approved-by: Christian Cueni
2024-02-09 08:15:46 +00:00
0c170979c0
Merged develop into feature/VBV-641-vorschau-lernbegleitung
2024-02-09 08:00:27 +00:00
595119e9e4
Merged in fix/praxisauftrag-translations (pull request #284 )
...
Use correct translation for Praxisauftrag
2024-02-08 14:40:17 +00:00
5186f9e83d
Merged develop into fix/praxisauftrag-translations
2024-02-08 13:59:32 +00:00
a06dd7b4d4
Merged in fix/company-country-not-set-test (pull request #283 )
...
chore: add test for company address not set in checkout
Approved-by: Christian Cueni
2024-02-08 12:42:39 +00:00
6fc58cfbcb
Use correct translation for Praxisauftrag
2024-02-08 13:35:54 +01:00
9458708b5d
Merged develop into fix/company-country-not-set-test
2024-02-08 12:28:04 +00:00
c0538bb9db
chore: add test for company address not set in checkout
2024-02-08 12:43:22 +01:00
b557c832b9
Merged in fix/company-country-not-set (pull request #282 )
...
fix: do not fail if company_country is not set
Approved-by: Christian Cueni
2024-02-08 11:23:06 +00:00
a4ef999684
fix: do not fail if company_country is not set
...
it's optional
2024-02-08 11:25:37 +01:00
8cff12fc10
feat: add course session permissions
2024-02-08 10:04:17 +01:00
1ced57212d
Merged in feature/VBV-529-prototyp-persoenliches-profil (pull request #280 )
...
Persönliches Profil
Approved-by: Christian Cueni
2024-02-07 15:15:08 +00:00
6f2094d4c9
Merge branch 'develop' into feature/VBV-529-prototyp-persoenliches-profil
2024-02-07 12:48:12 +01:00
f855ff25e0
fix: default edit mode
2024-02-06 16:03:41 +01:00
cc61816c92
feat: manually close popovers
2024-02-06 16:01:57 +01:00
c103d29f31
feat: remove settings
2024-02-06 15:53:33 +01:00
6263d905fd
feat: split profile edit
2024-02-06 15:35:25 +01:00
bd5cbd3394
fix: return binary if not image type, not crash e.g. on svg
2024-02-06 15:16:20 +01:00
162f8a50a9
fix: visual fixes
2024-02-06 14:54:12 +01:00
a40f066279
feat: avatar upload
2024-02-06 11:03:55 +01:00
2d2b5a86c3
fix: user state name
2024-02-06 09:20:09 +01:00
44868f4673
feat: user store cleanup
2024-02-06 09:15:34 +01:00
d9fefe1d62
feat: save profile
2024-02-05 18:12:51 +01:00
5d510e0d04
fix: use ItDropdown, simplify UI state
2024-02-05 17:37:01 +01:00
b44db0d788
fix: smaller visual "bug" fixes
2024-02-05 15:41:31 +01:00
befbee23b4
feat: user store
2024-02-05 12:02:15 +01:00
9a405b6900
Add payment problems text
2024-02-05 09:36:21 +01:00
ab31695dab
Merge branch 'develop' into feature/VBV-529-prototyp-persoenliches-profil
2024-02-05 09:19:14 +01:00
a921d5f548
fix: make test more robust ;)
2024-02-02 18:52:06 +01:00
Christian Cueni
Livio Bieri
Livio Bieri
Reto Aebersold
Reto Aebersold