Harald Bamberger
ca4043833e
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-05 18:04:32 +02:00
Harald Bamberger
643929a0c6
add cis4 class to body to make it harder for cms content style sheets to override padding, add names to calendar events renderer components, show lvmenu not only for route MyLvPlan but e.g. also in Dashboard LvPlan Widget
2026-10-05 17:56:57 +02:00
Harald Bamberger
9605227139
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-29 14:58:05 +02:00
Andreas Österreicher
2050f5ae65
Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool'
2026-09-23 11:14:01 +02:00
Andreas Österreicher
587e523990
Merge branch 'feature-67251/infocenter_zum_reihungstest_freigegeben_neue_spalte_eqk'
2026-09-23 11:03:20 +02:00
adisposkofh
43b849e787
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-22 13:44:49 +02:00
adisposkofh
dafff1620d
minor fix
2026-09-16 16:33:00 +02:00
adisposkofh
fc89a25d3a
merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 16:31:56 +02:00
adisposkofh
fba5953b59
merged features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 14:57:23 +02:00
adisposkofh
9a45efd558
merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 13:42:03 +02:00
Harald Bamberger
205b217854
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into cis40_2026-05_ma_rc_routerlink
2026-09-16 11:16:29 +02:00
adisposkofh
09f18d9039
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
2026-09-15 17:03:03 +02:00
Harald Bamberger
9c43374267
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-15 07:53:10 +02:00
Alexei Karpenko
073160dde4
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-10 20:08:08 +02:00
Andreas Österreicher
1bf2b707ef
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-09 09:43:11 +02:00
Manuela Thamer
52f24645fb
update link StudVW
2026-09-08 14:23:59 +02:00
adisposkofh
07d04d5701
Merge branch 'master' into feature-78496_lv-plan-range-view
2026-09-07 11:25:12 +02:00
Andreas Österreicher
658c8d6bd4
Schreibberechtigungsprüfung bei Anrechnungen angepasst damit diese korrekt angezeigt wird wenn oe_kurzb nicht gleich der Kurzbz des Studiegangs ist
2026-09-03 08:44:10 +02:00
adisposkofh
a53551b462
lv plan range view print css
2026-09-02 13:01:13 +02:00
Ivymaster
de627171d5
WIP
2026-08-26 14:46:49 +02:00
Manuela Thamer
90bce8d3d5
refactor templates: scroll table, only table header is sticky, rename css.file
2026-08-21 14:39:45 +02:00
Ivymaster
708ffac47e
WIP
2026-08-20 17:05:38 +02:00
Harald Bamberger
778bed969d
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into cis40_2026-05_ma_rc_routerlink
2026-08-20 10:59:01 +02:00
Harald Bamberger
cff5fa6d7b
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink_ma0080
2026-08-20 10:56:34 +02:00
Harald Bamberger
cabda4cc35
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-08-20 08:13:30 +02:00
Harald Bamberger
37d9ef66ed
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
2026-08-20 07:38:16 +02:00
ma0068
9a592047a0
merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 13:54:02 +02:00
ma0068
e6947a3246
merge master into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 12:04:28 +02:00
Johann Hoffmann
7121b46bf9
menu app -> menu component; host menu component in cis app and teleport it to back to #cis-header in DOM; avoids rollup bundle seeing 2 imports and bundling it into 2 instances, this way rollup only ever creates the instance for Cis App and teleports it away; actually improves Menu component, since it is now a logical child of Cis app and retrieve provide/inject and possibly other reactives; keep Menu app as a menu component wrapper in case a legacy/content page is loaded -> switch inside Menu app not mounting if it detects a fhccontent element indicating cis4 native page; in CISVUE-Header.php duplicate props/data-attributes for either case; Link.js now checks for router availability since legacy pages dont have this.$router anymore and does not need to use CompatLinkHelpers, since the singleton router instance should be able to resolve all valid ones itself; Entry.js now always passes the URL to CisMenuLink so the first click on an expandable still toggles AND navigates;
2026-08-14 16:08:23 +02:00
Harald Bamberger
4c1d3ceedf
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink
2026-08-13 17:39:20 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Harald Bamberger
9f0b387ab6
use phrase ui/cancel instead of ui/abbrechen
2026-08-11 09:21:48 +02:00
Harald Bamberger
3a97f20122
add v-bind syntax to avoid prop type warning
2026-08-11 09:08:32 +02:00
Harald Bamberger
046a552f34
Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung
2026-08-11 08:11:55 +02:00
Harald Bamberger
196e9be728
comment in groups in lvvw treemenu to have them for drag and drop, add language and isMobile injects to prevent warnings from searchbar component, studvw clear selection when degree program changes, update fontawesome from 6.1.1 to 6.7.2 and primeicons from 5.0.0 to 6.0.1 to prevent glyph bbox warnings in ff browser console
2026-08-10 06:48:53 +02:00
Ivymaster
b59c962f60
WIP: Work on news create/edit page
2026-08-06 12:46:41 +02:00
Harald Bamberger
b6aa459b98
Merge branch 'feature-777242/StudVW_alternative_Contacting_ma0080' into studvw_lvvw_2026_08_rc_77973_76688
2026-08-06 11:56:18 +02:00
ma0068
0a46bf52dd
- neue funktion loadZeitsperrenforUid
...
– route für maUid
- Zeitsperren als Cis-App
– link für Zeitsperren maUid in Mitarbeiterprofil
- component ZeitsperrenMitarbeiterUid
- Dropdown oes:show only active Oes
2026-08-04 08:00:40 +02:00
Harald Bamberger
9f68fe6b3b
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
2026-08-03 11:18:34 +02:00
Harald Bamberger
ea3d01d23b
rebuild tags for degree programm or selection - split in multiple requests and render progressbar in loading modal
2026-08-03 08:37:45 +02:00
chfhtw
2b4aef5633
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
2026-07-31 12:52:29 +02:00
ma0068
96b4210d21
refactor backend
...
css file for showing inactive items in dropdown
fix missing view for vertretung zeitsperren
sticky top for header
2026-07-30 15:29:15 +02:00
Harald Bamberger
aa52c32d40
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
2026-07-28 15:50:06 +02:00
Harald Bamberger
02a97fb0e2
Merge branch 'feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen' into studvw_2026_08_rc
2026-07-28 15:35:54 +02:00
Johann Hoffmann
4e6a2d5218
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/config/routes.php
# application/controllers/api/frontend/v1/Lehre.php
# application/views/CisRouterView/CisRouterView.php
# cis/private/lehre/notenliste.xls.php
# public/js/api/factory/lehre.js
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/helpers/StringHelpers.js
# system/phrasesupdate.php
2026-07-27 15:41:29 +02:00
chfhtw
b8d86ba628
Use luxon date formatters in studvw student list
2026-07-15 14:48:55 +02:00
chfhtw
11cfa670d6
Add dynamic tabulatorcolumns to lvverwaltung
2026-07-15 11:05:37 +02:00
ma0048
c233902fe2
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/libraries/LektorLib.php
2026-07-15 09:20:57 +02:00
Harald Bamberger
7e6d670d82
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-13 14:32:51 +02:00
Harald Bamberger