 Paolo
|
66d8c303f3
|
Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011
|
2026-07-09 11:07:16 +02:00 |
|
|
Paolo
|
cb3dcf3e1d
|
Merge branch 'master' into feature-13011/installation_on_multiple_servers
|
2026-07-09 11:01:59 +02:00 |
|
|
Harald Bamberger
|
e4f43cc820
|
Merge branch 'master' into feature/76981-missing-mailing-lists
|
2026-07-08 14:15:40 +02:00 |
|
|
Harald Bamberger
|
138c80c97a
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-26 15:15:47 +02:00 |
|
|
Harald Bamberger
|
a595daa9b4
|
Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren
|
2026-06-26 11:50:12 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +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 |
|
|
Paolo
|
2df19fa16a
|
Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011
|
2026-06-11 13:03:02 +02:00 |
|
|
Paolo
|
d0922993f0
|
Merge branch 'master' into feature-6237/Phrases_system_MkIII
|
2026-06-11 13:02:29 +02:00 |
|
|
Paolo
|
35f3239fc0
|
Merge branch 'master' into feature-13011/installation_on_multiple_servers
|
2026-06-11 12:53:31 +02:00 |
|
|
Harald Bamberger
|
7f630f24d5
|
StundenplanLib: check array index access before
|
2026-05-26 07:54:41 +02:00 |
|
|
Harald Bamberger
|
449537ef77
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-18 07:26:37 +02:00 |
|
|
adisposkofh
|
0a4906c5ac
|
added course-specific mailing lists
|
2026-05-13 16:07:43 +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 |
|
|
Werner Masik
|
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 |
|
|
Paolo
|
02a8797d4b
|
Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011
|
2026-04-27 13:19:42 +02:00 |
|
|
Paolo
|
2655cc0e34
|
Merge branch 'master' into feature-6237/Phrases_system_MkIII
|
2026-04-27 13:18:56 +02:00 |
|
|
Paolo
|
9b60f57d7a
|
Merge branch 'master' into feature-13011/installation_on_multiple_servers
|
2026-04-27 13:14:15 +02:00 |
|
|
Harald Bamberger
|
e984425e36
|
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
|
2026-04-23 12:09:09 +02:00 |
|
|
Harald Bamberger
|
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 |
|
|
Harald Bamberger
|
d926e4165b
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-04-20 17:52:24 +02:00 |
|
|
Harald Bamberger
|
92a2053b42
|
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
|
2026-04-20 17:30:14 +02:00 |
|
|
Harald Bamberger
|
6cc09969dd
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-04-20 10:45:20 +02:00 |
|
|
adisposkofh
|
70ebe34f1f
|
merge develop into -- manual conflict resolution
|
2026-04-16 16:09:03 +02:00 |
|
|
Harald Bamberger
|
6ce14a25d7
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-15 11:49:26 +02:00 |
|
|
adisposkofh
|
f1c3c8296f
|
implemented 'OtherLvPlan' to view other users' timetables
|
2026-04-13 10:41:41 +02:00 |
|
|
chfhtw
|
f06e59b362
|
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
|
2026-04-08 14:13:02 +02:00 |
|
|
Werner Masik
|
5c463c0866
|
add vordienstzeit to lohnguide
|
2026-04-06 22:25:13 +02:00 |
|
|
chfhtw
|
00e019d6fe
|
cleanup db data
|
2026-03-26 15:21:41 +01:00 |
|
|
Harald Bamberger
|
5b0c115b10
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-03-25 17:06:52 +01:00 |
|
|
Harald Bamberger
|
6fbb09eb6e
|
group or clause
|
2026-03-25 16:32:43 +01:00 |
|
|
chfhtw
|
91d656ff60
|
remove unnecessary function
|
2026-03-25 16:11:52 +01:00 |
|
|
chfhtw
|
e3093bdf3f
|
get magic funktionen (Mitarbeiter, Student) as dashboard presets
|
2026-03-24 15:15:36 +01:00 |
|
|
chfhtw
|
b11d8d056a
|
get access rights from permissionlib
|
2026-03-24 15:15:12 +01:00 |
|
|
Paolo
|
458dc1aaec
|
Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011
|
2026-03-24 09:57:54 +01:00 |
|
|
Paolo
|
1f1d0a94e6
|
Merge branch 'master' into feature-6237/Phrases_system_MkIII
|
2026-03-24 09:57:37 +01:00 |
|
|
Paolo
|
944bc44a0e
|
Merge branch 'master' into feature-13011/installation_on_multiple_servers
|
2026-03-24 09:50:48 +01:00 |
|
|
chfhtw
|
f15fd40636
|
dashboardlib bug: array <=> stdclass
|
2026-03-23 15:41:32 +01:00 |
|
|
Harald Bamberger
|
059b13938e
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-03-18 11:46:27 +01:00 |
|
|
Werner Masik
|
5fbcf588ed
|
fix vertragsbestandteil lohnguide
|
2026-03-05 14:29:56 +01:00 |
|
|
Werner Masik
|
e054f1222b
|
basic model and factory for lohnguide
|
2026-03-03 11:50:45 +01:00 |
|
|
Paolo
|
d6108d816e
|
Merge branch 'master' into hotfix-69228/DOCSBOX
|
2026-02-23 14:28:54 +01:00 |
|
|
ma0048
|
3578e01838
|
unterbrecher ablehnungsgrund anzeigen
|
2026-02-23 08:47:36 +01:00 |
|
|
Paolo
|
b2358c57d7
|
Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011
|
2026-02-09 12:35:59 +01:00 |
|
|
Paolo
|
6b7e061c87
|
Merge branch 'master' into feature-6237/Phrases_system_MkIII
|
2026-02-09 12:34:28 +01:00 |
|
|
Paolo
|
912896d4da
|
Merge branch 'master' into feature-13011/installation_on_multiple_servers
|
2026-02-09 12:27:32 +01:00 |
|
|
Harald Bamberger
|
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 |
|
|
Harald Bamberger
|
85a10e27cc
|
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
|
2026-02-02 17:59:15 +01:00 |
|
|
Paolo
|
36823dac7d
|
Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011
|
2026-01-13 17:11:14 +01:00 |
|