 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
|
b97dec7343
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-05 13:11:02 +02:00 |
|
|
Harald Bamberger
|
4ba2869632
|
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
|
2026-10-05 11:22:59 +02:00 |
|
|
Harald Bamberger
|
e24a66a454
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-30 15:59:57 +02:00 |
|
|
Harald Bamberger
|
76a8e00edf
|
Merge branch 'master' into feature-77757/WidgetsBerechtigung
|
2026-09-30 15:23:08 +02:00 |
|
|
Harald Bamberger
|
59c5100a86
|
Merge branch 'feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix' into cis40_2026-09_ma_rc
|
2026-09-29 18:19:39 +02:00 |
|
|
Harald Bamberger
|
0fafb95bd8
|
Merge branch 'bugfix/cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09-news-administration' into cis40_2026-09_ma_rc
|
2026-09-29 14:59:34 +02:00 |
|
|
Harald Bamberger
|
9605227139
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-29 14:58:05 +02:00 |
|
|
Ivymaster
|
43d5068cda
|
Add fix for unconsistent translation options in news administration form
|
2026-09-28 19:01:26 +02:00 |
|
|
Johann Hoffmann
|
f817527ab9
|
fix faulty master merge conflicts; adapted getTermine & getPaAbgaben in Paabgabe_model.php; reordered created hook in ProjektabgabeUebersicht.js to start loading phrasen immediately;
|
2026-09-24 11:50:00 +02:00 |
|
|
Johann Hoffmann
|
754e619e30
|
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Compat.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2026-09-24 11:25:31 +02:00 |
|
|
adisposkofh
|
ab2333f708
|
limiting fetched columns in getUserData endpoint
|
2026-09-23 16:19:45 +02:00 |
|
|
adisposkofh
|
c4e79ffdf9
|
filtering selectable semesters in range view depending on user age
|
2026-09-23 16:17:45 +02:00 |
|
|
Harald Bamberger
|
15c1da74a2
|
CisMenu: do not overwrite calculated url if menuitem is multiple times in menu tree
|
2026-09-23 16:09:42 +02:00 |
|
|
Harald Bamberger
|
d33b45d7cb
|
Merge branch 'bhdev_backport_compat'
|
2026-09-23 14:58:26 +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 |
|
|
Andreas Österreicher
|
5ec1a1c54c
|
Merge branch 'feature-77686/infocentertool_status_setzen_fuer_zgv_pruefung_soll_message_ausloesen'
|
2026-09-23 10:56:54 +02:00 |
|
|
Harald Bamberger
|
8b44e4475b
|
Merge branch 'master' of github.com:FH-Complete/FHC-Core into bhdev_backport_compat
|
2026-09-22 16:51:34 +02:00 |
|
|
Harald Bamberger
|
d251987850
|
backport compat controller and component
|
2026-09-22 16:50:56 +02:00 |
|
|
adisposkofh
|
96104fd93a
|
fixed news model query syntax error
|
2026-09-22 14:37:12 +02:00 |
|
|
adisposkofh
|
c34a74c040
|
reservierung model table alias fix
|
2026-09-22 14:16:31 +02:00 |
|
|
Harald Bamberger
|
ba92eea7eb
|
studvw: fix lvtermine student_lehrverband
|
2026-09-22 14:09:51 +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 |
|
|
Harald Bamberger
|
50951dfdcf
|
anrechnungen: add pdf file extension to content disposition filename
|
2026-09-22 13:00:28 +02:00 |
|
|
Harald Bamberger
|
8eb27b194f
|
add target attribute to redirect content menu entries, use entry target attribute if set when rendering cis4 menu
|
2026-09-18 17:12:30 +02:00 |
|
|
adisposkofh
|
9bd3e7b1bc
|
removing obsolete use of viewData prop
|
2026-09-18 14:06:27 +02:00 |
|
|
adisposkofh
|
45595ab1fd
|
replacing view-provided permissions w/ querying permissions endpoint
|
2026-09-18 14:05:45 +02:00 |
|
|
adisposkofh
|
1a81f4a541
|
implemented missing MyReservation controller
|
2026-09-17 18:09:09 +02:00 |
|
|
adisposkofh
|
326e8c651c
|
minor doc fix|
|
2026-09-17 18:06:39 +02:00 |
|
|
adisposkofh
|
dfaaabfc2a
|
implemented permissions controller, reworked news admin permissions into api call
|
2026-09-17 18:05:24 +02:00 |
|
|
Harald Bamberger
|
579a55a00d
|
fix nested ternary operators
|
2026-09-17 14:18:10 +02:00 |
|
|
Andreas Österreicher
|
0a00caa1e4
|
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
|
2026-09-17 14:00:07 +02:00 |
|
|
Alexei Karpenko
|
0dadaece08
|
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
|
2026-09-16 16:59:09 +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
|
aaf8dd16ef
|
merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 15:08:23 +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
|
7ea80395a8
|
merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 14:43:10 +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 |
|
|
Harald Bamberger
|
e5ec9177e3
|
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink_ma0080
|
2026-09-16 11:04:48 +02:00 |
|
|
Harald Bamberger
|
75c341d983
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-09-16 10:55:13 +02:00 |
|
|
Harald Bamberger
|
6faf1cbcc2
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into cis40_2026-05_ma_rc_routerlink
|
2026-09-16 10:48:40 +02:00 |
|
|
adisposkofh
|
09f18d9039
|
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
|
2026-09-15 17:03:03 +02:00 |
|
|
Johann Hoffmann
|
69fd223358
|
fix load projektarbeit.studiensemester_kurzbz for fetchProjektarbeitById in order to query getDefaultStundensaetze successfully
|
2026-09-15 11:49:19 +02:00 |
|
|
Harald Bamberger
|
9c43374267
|
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
|
2026-09-15 07:53:10 +02:00 |
|
|
adisposkofh
|
80e17e264a
|
merged cis40_2026-05_ma_rc into
|
2026-09-14 17:08:15 +02:00 |
|
|
Harald Bamberger
|
6dfe292776
|
API LV: extend regex to allow studiengang_kz 0
|
2026-09-14 11:09:45 +02:00 |
|