 Harald Bamberger
|
6f4482cff4
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-09 13:17:02 +02:00 |
|
|
Harald Bamberger
|
96a373682a
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-09 13:16:44 +02:00 |
|
|
Harald Bamberger
|
9e2a818eab
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-06 15:35:02 +02:00 |
|
|
Harald Bamberger
|
27bd463109
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-06 15:34:32 +02:00 |
|
|
Harald Bamberger
|
784e5693b4
|
compat component add/remove css class via lifecycle hooks to apply compat specific rules
|
2026-10-06 15:22:16 +02:00 |
|
|
Harald Bamberger
|
3214ae3101
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-06 14:20:21 +02:00 |
|
|
Harald Bamberger
|
1f570f8495
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-06 14:19:18 +02:00 |
|
|
Harald Bamberger
|
67a33f2ceb
|
revert dashboard item overscroll-behavior to auto, so scrolling the page is not only possible on the page borders
|
2026-10-06 14:15:46 +02:00 |
|
|
Harald Bamberger
|
751445c199
|
Merge branch 'feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router'
|
2026-10-06 10:59:19 +02:00 |
|
|
Harald Bamberger
|
916f5dd68e
|
disable search for lv and le for the moment
|
2026-10-06 10:58:20 +02:00 |
|
|
Harald Bamberger
|
efc8fa1eeb
|
Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router
|
2026-10-06 10:27:46 +02:00 |
|
|
Harald Bamberger
|
5313693651
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-05 18:32:04 +02:00 |
|
|
Harald Bamberger
|
0239977d21
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-05 18:31:10 +02:00 |
|
|
Harald Bamberger
|
d58edff92d
|
fix propertyname for api response
|
2026-10-05 18:26:42 +02:00 |
|
|
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
|
8db60c67f8
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-05 13:11:41 +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
|
65c931ea2d
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-10-01 12:44:52 +02:00 |
|
|
Harald Bamberger
|
5aa007f49c
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-01 12:43:17 +02:00 |
|
|
Harald Bamberger
|
f3d031ab16
|
cismenu: add cis-main-menu class to main nav, add li elements to ul, style cis-main-menu ul and li to prevent interferec with cms content styles, add draggable false to cis menu entries to improve menu scrolling especially on mobile devices
|
2026-10-01 11:48:51 +02:00 |
|
|
Harald Bamberger
|
762fd1cadd
|
update demo datenstand
|
2026-09-30 16:20:15 +02:00 |
|
|
Harald Bamberger
|
9feb442a07
|
Merge branch 'cis40_2026-09_ma_rc' into demo-cis40
|
2026-09-30 16:14:03 +02:00 |
|
|
Harald Bamberger
|
e24a66a454
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-30 15:59:57 +02:00 |
|
|
Harald Bamberger
|
3d8c4fa4d0
|
Merge branch 'feature-77757/WidgetsBerechtigung'
|
2026-09-30 15:48:00 +02:00 |
|
|
Harald Bamberger
|
272014bd78
|
remove odd phrases
|
2026-09-30 15:38:43 +02:00 |
|
|
Harald Bamberger
|
76a8e00edf
|
Merge branch 'master' into feature-77757/WidgetsBerechtigung
|
2026-09-30 15:23:08 +02:00 |
|
|
Harald Bamberger
|
a53c4fd623
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-30 12:24:30 +02:00 |
|
|
Harald Bamberger
|
ce62713790
|
Merge branch 'bug-82297/ausweis-date-preview-issue'
|
2026-09-30 12:11:13 +02:00 |
|
|
Harald Bamberger
|
34761db664
|
rename phrase
|
2026-09-30 10:56:30 +02:00 |
|
|
Harald Bamberger
|
c7131ed775
|
revert changes to old cis since issue does not occur there
|
2026-09-30 10:53:01 +02:00 |
|
|
Harald Bamberger
|
b57e1984a8
|
Merge branch 'master' into bug-82297/ausweis-date-preview-issue
|
2026-09-30 10:20:28 +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
|
cf6e747def
|
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
|
2026-09-29 18:03:56 +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
|
1d838f8116
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09' into cis40_2026-09_ma_rc
|
2026-09-29 14:59:00 +02:00 |
|
|
Harald Bamberger
|
9605227139
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-29 14:58:05 +02:00 |
|
|
Harald Bamberger
|
acedc11be8
|
adapt styling detailheader employees
|
2026-09-24 14:39:38 +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 |
|
|
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 |
|
|
Harald Bamberger
|
ba92eea7eb
|
studvw: fix lvtermine student_lehrverband
|
2026-09-22 14:09:51 +02:00 |
|
|
Harald Bamberger
|
50951dfdcf
|
anrechnungen: add pdf file extension to content disposition filename
|
2026-09-22 13:00:28 +02:00 |
|
|
Harald Bamberger
|
be7527e994
|
increase length of column taglib in table public.tbl_notiz_typ
|
2026-09-22 09:52:09 +02:00 |
|
|
Harald Bamberger
|
d5c1721ab1
|
Merge branch 'feature-83457/cis4_redirect_blank_target'
|
2026-09-18 17:14:49 +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 |
|
|
Harald Bamberger
|
579a55a00d
|
fix nested ternary operators
|
2026-09-17 14:18:10 +02:00 |
|
|
Harald Bamberger
|
f7465047cb
|
Merge branch 'feature-75469/LeOptional4Projektarbeit'
|
2026-09-16 17:35:55 +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 |
|
|
Harald Bamberger
|
9c43374267
|
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
|
2026-09-15 07:53:10 +02:00 |
|
|
Harald Bamberger
|
6dfe292776
|
API LV: extend regex to allow studiengang_kz 0
|
2026-09-14 11:09:45 +02:00 |
|
|
Harald Bamberger
|
c8c7d1566c
|
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
|
2026-09-11 11:43:23 +02:00 |
|
|
Harald Bamberger
|
11f2f0ad75
|
Merge branch 'master' into bugfix-83277_menu-nodes-subnodes-behavior
|
2026-09-10 10:48:31 +02:00 |
|
|
Harald Bamberger
|
4abe6f0d24
|
Merge branch 'bugfix_missing-studvw-filter-clear-action-button'
|
2026-09-09 16:15:39 +02:00 |
|
|
Harald Bamberger
|
6d641bbd06
|
pass in uid by reference
|
2026-08-24 13:56:55 +02:00 |
|
|
Harald Bamberger
|
3455aed3f5
|
Merge branch 'bhdev_master_stundenplan'
|
2026-08-24 13:46:09 +02:00 |
|
|
Harald Bamberger
|
f84d12277d
|
remove debug code
|
2026-08-24 07:31:47 +02:00 |
|
|
Harald Bamberger
|
9bf5bc2ad9
|
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
|
2026-08-24 07:26:12 +02:00 |
|
|
Harald Bamberger
|
0ce4acc71b
|
Merge branch 'master' into demo-cis40
|
2026-08-21 14:10:33 +02:00 |
|
|
Harald Bamberger
|
33038f409a
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into demo-cis40
|
2026-08-21 11:44:17 +02:00 |
|
|
Harald Bamberger
|
1b4297a9bf
|
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink_ma0080
|
2026-08-21 11:43:59 +02:00 |
|
|
Harald Bamberger
|
1bbea69139
|
refine menuItem content check
|
2026-08-21 11:41:21 +02:00 |
|
|
Harald Bamberger
|
f8cea9036c
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into demo-cis40
|
2026-08-21 08:45:25 +02:00 |
|
|
Harald Bamberger
|
916dab2584
|
add Zeitsperren to search result employee action buttons
|
2026-08-21 08:36:58 +02:00 |
|
|
Harald Bamberger
|
67d53126c3
|
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink_ma0080
|
2026-08-21 08:35:27 +02:00 |
|
|
Harald Bamberger
|
d639ec5e70
|
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
|
2026-08-21 08:35:01 +02:00 |
|
|
Harald Bamberger
|
c6b1d518cf
|
use correct model name
|
2026-08-21 08:34:40 +02:00 |
|
|
Harald Bamberger
|
27765606e3
|
bufix akadGrad by sex if exists
|
2026-08-20 19:31:37 +02:00 |
|
|
Harald Bamberger
|
aff83fae49
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into cis40_2026-05_ma_rc_routerlink
|
2026-08-20 15:23:33 +02:00 |
|
|
Harald Bamberger
|
90d8f5f2cc
|
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_routerlink_ma0080
|
2026-08-20 15:23:09 +02:00 |
|
|
Harald Bamberger
|
4e3ddad8c1
|
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
|
2026-08-20 15:22:04 +02:00 |
|
|
Harald Bamberger
|
c2cb3f5b7a
|
move message to inner if
|
2026-08-20 15:21:47 +02:00 |
|
|
Harald Bamberger
|
75d2cabdbe
|
bugfix lv-plan
|
2026-08-20 15:10:26 +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
|
c24b6e6b32
|
fix variable name
|
2026-08-20 09:49:07 +02:00 |
|
|
Harald Bamberger
|
e7b4a512ca
|
remove duplicate import
|
2026-08-20 09:26:03 +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
|
a5d4629f07
|
Merge branch 'cis40_2026-05_ma_rc_78461_reservation_group_options' into cis40_2026-05_ma_rc
|
2026-08-20 07:48:18 +02:00 |
|
|
Harald Bamberger
|
16166db31a
|
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
|
2026-08-20 07:46:02 +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 |
|
|
Harald Bamberger
|
b2213bff62
|
Merge branch 'bugfix-70747/excluding-zeitverfugbarkeit-zeitsperren-option' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
|
2026-08-20 07:14:47 +02:00 |
|
|
Harald Bamberger
|
411d2192cb
|
Merge branch 'master' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
|
2026-08-19 18:44:20 +02:00 |
|
|
Harald Bamberger
|
391bf296d7
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-08-19 18:41:29 +02:00 |
|
|
Harald Bamberger
|
bae9d6d9a0
|
Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning'
|
2026-08-19 17:11:12 +02:00 |
|
|
Harald Bamberger
|
43d6a882ce
|
add padding to tags buttons, remove orphanded template closing tag
|
2026-08-19 17:07:25 +02:00 |
|
|
Harald Bamberger
|
7f3b4100ab
|
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
|
2026-08-19 15:07:07 +02:00 |
|
|
Harald Bamberger
|
9f54ecce54
|
Merge branch 'epic/LVEvaluierung-Neu'
|
2026-08-19 13:59:00 +02:00 |
|
|
Harald Bamberger
|
55a6ec9d0d
|
fix handling of grundbetrag and betrag_valorisiert
|
2026-08-19 11:48:22 +02:00 |
|
|
Harald Bamberger
|
0e985113ec
|
Merge branch 'feature-77666/Details_anzeigen_der_Valorisierung_pro_Person'
|
2026-08-19 08:20:42 +02:00 |
|
|
Harald Bamberger
|
8d9113d5c8
|
Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person
|
2026-08-19 08:06:16 +02:00 |
|
|
Harald Bamberger
|
7ce81ad4bd
|
Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung'
|
2026-08-19 07:57:07 +02:00 |
|
|
Harald Bamberger
|
ea56ec8daa
|
change wording
|
2026-08-19 07:50:50 +02:00 |
|
|
Harald Bamberger
|
9e9990dd6e
|
Merge branch 'cis40_2026-05_ma_rc_78129_reservation_finetuning' into cis40_2026-05_ma_rc_78461_reservation_group_options
|
2026-08-18 18:23:35 +02:00 |
|
|
Harald Bamberger
|
b80805e09c
|
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_78461_reservation_group_options
|
2026-08-18 18:22:20 +02:00 |
|