0411befe8d
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-06-26 15:16:18 +02:00
138c80c97a
Merge branch 'master' into cis40_2026-02_rc
2026-06-26 15:15:47 +02:00
a595daa9b4
Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren
2026-06-26 11:50:12 +02:00
164c11e10a
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-06-18 13:20:25 +02:00
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +02:00
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
1cff18112b
removed auto-ban on sunday room reservations
2026-06-02 11:09:13 +02:00
6019489ef1
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-05-29 13:38:58 +02:00
7f630f24d5
StundenplanLib: check array index access before
2026-05-26 07:54:41 +02:00
672acfe8fe
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-05-18 16:49:53 +02:00
449537ef77
Merge branch 'master' into cis40_2026-02_rc
2026-05-18 07:26:37 +02:00
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
d27071528f
revert change to comparision in markDirty Method
2026-05-13 11:16:18 +02:00
a5d5d42ba3
fixed issue missing event attributes in stundenplan library
2026-05-12 13:19:57 +02:00
7f13c128f1
allow null value for vordienstzeit; changed comparison in markDirty to !== (because of 0 vs. null issue)
2026-05-04 20:35:51 +02:00
cffa493984
Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc
2026-05-04 18:17:53 +02:00
e984425e36
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
2026-04-23 12:09:09 +02:00
d14b9e2ab5
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-04-20 18:02:23 +02:00
d926e4165b
Merge branch 'master' into cis40_2026-02_rc
2026-04-20 17:52:24 +02:00
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30:14 +02:00
c53d451000
Merge branch 'master' into feature-68301/cis4_ma_raumreservierung
2026-04-20 16:34:30 +02:00
6cc09969dd
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-04-20 10:45:20 +02:00
70ebe34f1f
merge develop into -- manual conflict resolution
2026-04-16 16:09:03 +02:00
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
f1c3c8296f
implemented 'OtherLvPlan' to view other users' timetables
2026-04-13 10:41:41 +02:00
f06e59b362
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2026-04-08 14:13:02 +02:00
5c463c0866
add vordienstzeit to lohnguide
2026-04-06 22:25:13 +02:00
00e019d6fe
cleanup db data
2026-03-26 15:21:41 +01:00
5b0c115b10
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-03-25 17:06:52 +01:00
6fbb09eb6e
group or clause
2026-03-25 16:32:43 +01:00
91d656ff60
remove unnecessary function
2026-03-25 16:11:52 +01:00
e3093bdf3f
get magic funktionen (Mitarbeiter, Student) as dashboard presets
2026-03-24 15:15:36 +01:00
b11d8d056a
get access rights from permissionlib
2026-03-24 15:15:12 +01:00
f15fd40636
dashboardlib bug: array <=> stdclass
2026-03-23 15:41:32 +01:00
059b13938e
Merge branch 'master' into feature-70376/Lohnguide
2026-03-18 11:46:27 +01:00
5fbcf588ed
fix vertragsbestandteil lohnguide
2026-03-05 14:29:56 +01:00
e054f1222b
basic model and factory for lohnguide
2026-03-03 11:50:45 +01:00
d6108d816e
Merge branch 'master' into hotfix-69228/DOCSBOX
2026-02-23 14:28:54 +01:00
3578e01838
unterbrecher ablehnungsgrund anzeigen
2026-02-23 08:47:36 +01:00
37395b70f6
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-02-03 11:56:16 +01:00
85a10e27cc
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
2026-02-02 17:59:15 +01:00
1ce362b66b
Removed forgotten error_log
2026-01-07 15:54:59 +01:00
c113c80862
fix calculation of next student matrikelnr aka personenkennzeichen and student uid
2025-12-22 21:11:05 +01:00
0616236e00
bugfix: ZGV Übernahme bei Interessentenanlage, bestehende ZGVs die null sind ausfiltern
2025-12-18 12:48:08 +01:00
8f9f447acf
cis4 raumreservierung beta version
2025-12-18 11:08:40 +01:00
50439ee6cc
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
2025-12-09 11:37:57 +01:00
455e0533fe
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2025-11-21 08:53:36 +01:00
a8c4fc7607
CIS4 #69146 Lvplan for View StG/Semester/Verband/Gruppe
...
- new API Endpoint lvPlan/eventsStgOrg
- new view Cis/LvPlan/StgOrg
- new component LvPlan/StgOrg.js
- new overview Cis/OverviewLvPlan with Dropdown
- phrases
2025-11-20 14:06:12 +01:00
0b6dc34220
If docsbox queue is slow, the DocsboxLib can stop checking the queued document status and raise an error
2025-11-10 15:41:01 +01:00
4407310f40
Merge branch 'master' into feature-67484/lvverwaltung_finetunning
2025-10-20 11:33:43 +02:00
Harald Bamberger