 Harald Bamberger
|
41d40102f3
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-06-22 15:26:48 +02:00 |
|
|
Harald Bamberger
|
95e63f865c
|
add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php
|
2026-06-22 15:25:51 +02:00 |
|
|
Harald Bamberger
|
1496045c40
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-06-18 13:46:21 +02:00 |
|
|
Harald Bamberger
|
e2dadcd208
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-06-18 13:23:49 +02:00 |
|
|
Harald Bamberger
|
164c11e10a
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-06-18 13:20:25 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Harald Bamberger
|
c7bac03429
|
concat escaped string correct
|
2026-06-17 17:45:18 +02:00 |
|
|
Harald Bamberger
|
07d3b32279
|
fix typo
|
2026-06-17 17:23:05 +02:00 |
|
|
Harald Bamberger
|
245d0d3369
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-06-17 17:15:37 +02:00 |
|
|
Harald Bamberger
|
d3d04c5a77
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-06-17 14:44:25 +02:00 |
|
|
Harald Bamberger
|
070ac1e878
|
override permission for all methods not only the overwritten ones
|
2026-06-15 14:37:43 +02:00 |
|
|
chfhtw
|
f5d81e4a93
|
move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query
|
2026-06-12 09:53:59 +02:00 |
|
|
adisposkofh
|
1cff18112b
|
removed auto-ban on sunday room reservations
|
2026-06-02 11:09:13 +02:00 |
|
|
Andreas Österreicher
|
30b8a406a5
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
|
2026-06-01 09:10:35 +02:00 |
|
|
Harald Bamberger
|
63ff8dd4c4
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-29 13:40:02 +02:00 |
|
|
Harald Bamberger
|
6019489ef1
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-29 13:38:58 +02:00 |
|
|
adisposkofh
|
d7b2964e4e
|
obsolete use of viewData object from cisRouterView
|
2026-05-26 17:33:38 +02:00 |
|
|
Harald Bamberger
|
9430135592
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-26 09:40:11 +02:00 |
|
|
Harald Bamberger
|
57eec98604
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 09:38:06 +02:00 |
|
|
Harald Bamberger
|
1561aa55b7
|
correct model path
|
2026-05-26 09:37:49 +02:00 |
|
|
Harald Bamberger
|
7f630f24d5
|
StundenplanLib: check array index access before
|
2026-05-26 07:54:41 +02:00 |
|
|
Harald Bamberger
|
b0fc5a3618
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-22 10:37:30 +02:00 |
|
|
Harald Bamberger
|
b0f90cafb6
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-22 10:36:54 +02:00 |
|
|
Harald Bamberger
|
c0c57ba378
|
remove irregular files
|
2026-05-22 10:36:28 +02:00 |
|
|
Harald Bamberger
|
ec1422a136
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-19 16:18:06 +02:00 |
|
|
Harald Bamberger
|
d56d1bc2bd
|
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
|
2026-05-19 16:17:35 +02:00 |
|
|
Harald Bamberger
|
45eca862ac
|
use table alias
|
2026-05-19 16:17:14 +02:00 |
|
|
Harald Bamberger
|
89e98056e6
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-19 16:12:31 +02:00 |
|
|
Harald Bamberger
|
9f738f4871
|
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
|
2026-05-19 16:11:37 +02:00 |
|
|
Harald Bamberger
|
3533a3fd4b
|
add missing comma
|
2026-05-19 16:11:08 +02:00 |
|
|
Harald Bamberger
|
5cf14aa886
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 10:28:32 +02:00 |
|
|
Harald Bamberger
|
ef2f9630a9
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-19 10:22:28 +02:00 |
|
|
Harald Bamberger
|
4d3c73c78f
|
add join condition for notizzuordung via prestudent_id only
|
2026-05-19 10:21:56 +02:00 |
|
|
Harald Bamberger
|
9ee6a0a01a
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 09:51:42 +02:00 |
|
|
Harald Bamberger
|
1e226f4515
|
Merge branch 'master' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:36 +02:00 |
|
|
Harald Bamberger
|
ca8fe5bd19
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:06 +02:00 |
|
|
Harald Bamberger
|
6d26ec2ab7
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-18 16:51:33 +02:00 |
|
|
Harald Bamberger
|
672acfe8fe
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-18 16:49:53 +02:00 |
|
|
ma0068
|
d4e170037b
|
add order Nachname, Vorname
|
2026-05-18 10:11:17 +02:00 |
|
|
Harald Bamberger
|
449537ef77
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-18 07:26:37 +02:00 |
|
|
ma0068
|
7aba7aefb9
|
add order mitarbeiter_uid
|
2026-05-15 11:05:12 +02:00 |
|
|
Harald Bamberger
|
0a18fcf732
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-13 21:11:36 +02:00 |
|
|
ma0068
|
e5ae400686
|
Tab Abschlusspruefung: use searchPersons instead of Mitarbeiter and refactor Label for dropdown
|
2026-05-13 17:38:39 +02:00 |
|
|
Harald Bamberger
|
68d97a5e97
|
handle case where old value or new value and not both are null explicitly in markDirty Method
|
2026-05-13 11:42:25 +02:00 |
|
|
Harald Bamberger
|
d27071528f
|
revert change to comparision in markDirty Method
|
2026-05-13 11:16:18 +02:00 |
|
|
Harald Bamberger
|
17772c3738
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-05-13 11:15:07 +02:00 |
|
|
adisposkofh
|
a5d5d42ba3
|
fixed issue missing event attributes in stundenplan library
|
2026-05-12 13:19:57 +02:00 |
|
|
Harald Bamberger
|
e08b731cb5
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-12 11:05:28 +02:00 |
|
|
ma0068
|
1b822fc8f8
|
reset config stv to readonly for automated tags
|
2026-05-11 15:15:06 +02:00 |
|
|
ma0068
|
368eded1fd
|
remove frontend filtering list for studiensemester, update logs TagJob
|
2026-05-11 15:12:53 +02:00 |
|