 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 |
|
|
Andreas Österreicher
|
30b8a406a5
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
|
2026-06-01 09:10:35 +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 |
|
|
Harald Bamberger
|
449537ef77
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-18 07:26:37 +02:00 |
|
|
Harald Bamberger
|
d0ef9ca96c
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-13 21:11:16 +02:00 |
|
|
Harald Bamberger
|
12d8c8447b
|
Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc
|
2026-05-13 21:10:27 +02:00 |
|
|
Harald Bamberger
|
905cd46942
|
add condition converting column tbl_bookmark.tag to jsonb
|
2026-05-13 21:09:18 +02:00 |
|
|
Harald Bamberger
|
e373e797f4
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-05-04 17:01:44 +02:00 |
|
|
Werner Masik
|
58a921b500
|
changed lohnguide kommentar data type to text
|
2026-04-30 09:47:12 +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
|
2c1702a20b
|
Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc
|
2026-04-23 11:19:17 +02:00 |
|
|
Harald Bamberger
|
2dd5a95232
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-04-23 10:41:41 +02:00 |
|
|
Harald Bamberger
|
80faa61c91
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-22 18:46:57 +02:00 |
|
|
Werner Masik
|
961ede66a9
|
lohnguide db update changed
|
2026-04-22 18:40:22 +02:00 |
|
|
Harald Bamberger
|
f6747713a1
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
|
2026-04-20 11:13:14 +02:00 |
|
|
Harald Bamberger
|
6cc09969dd
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-04-20 10:45:20 +02:00 |
|
|
Harald Bamberger
|
1c2491385f
|
Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags
|
2026-04-17 10:38:00 +02:00 |
|
|
adisposkofh
|
70ebe34f1f
|
merge develop into -- manual conflict resolution
|
2026-04-16 16:09:03 +02:00 |
|
|
ma0048
|
13e8a1a9f6
|
bug fixed + infocenter performance
|
2026-04-16 14:21:02 +02:00 |
|
|
Harald Bamberger
|
6ce14a25d7
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-15 11:49:26 +02:00 |
|
|
Werner Masik
|
c701d92779
|
fix db_update
|
2026-04-15 11:15:10 +02:00 |
|
|
Werner Masik
|
73e03ba901
|
Gehaltstyp Überstundenpauschale und Sachbezug PKW
|
2026-04-15 10:44:03 +02:00 |
|
|
adisposkofh
|
7daaf79fcc
|
implemented permission for viewing other users' lv plans
|
2026-04-13 15:44:09 +02:00 |
|
|
Werner Masik
|
423bbd95a6
|
add vordienstzeit to lohnguide
|
2026-04-06 22:25:12 +02:00 |
|
|
Cristina
|
386cc779bf
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-04-02 15:49:20 +02:00 |
|
|
chfhtw
|
00e019d6fe
|
cleanup db data
|
2026-03-26 15:21:41 +01:00 |
|
|
ma0068
|
b90c26412a
|
DB update: new Organisationseinheittyp Programm
|
2026-03-20 13:06:16 +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
|
41b2a6d1d4
|
added db migration for lohnguide
|
2026-03-04 10:53:30 +01:00 |
|
|
Johann Hoffmann
|
2dd732b924
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# application/views/CisRouterView/CisRouterView.php
|
2026-02-27 10:38:24 +01:00 |
|
|
Johann Hoffmann
|
16186bbee8
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2026-02-25 11:09:50 +01:00 |
|
|
Cristina
|
d1015956d1
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-02-25 10:54:29 +01:00 |
|
|
Johann Hoffmann
|
6c8eb9ac38
|
abgabetool dbupdate script check&insert new tbl_vorlage entry "PAANoSigAssSM"
|
2026-02-20 13:56:11 +01:00 |
|
|
Harald Bamberger
|
e12b7e1ed5
|
add indexes for person_id to table msg_message and msg_recipient, ensure tabulator data request is made before requests of create msg components
|
2026-02-17 08:06:30 +01:00 |
|
|
Johann Hoffmann
|
34555504df
|
Notenfreigabe email template insert in dbupdate3.4; notenvorschlag übernehmen cellHandler adjustment; WIP testing pruefungen & pruefungs config
|
2026-02-11 10:20:53 +01:00 |
|
|
Johann Hoffmann
|
c8cb484299
|
add missing email template public.tbl_vorlage inserts to checksystem script; checked template naming convention for higher case
|
2026-02-04 11:34:36 +01:00 |
|
|
Andreas Österreicher
|
023c2a10be
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2026-02-04 10:21:17 +01:00 |
|
|
Harald Bamberger
|
a3a03f6362
|
update check system to create or update widget path to start with public/...
|
2026-02-03 13:49:06 +01:00 |
|
|
Johann Hoffmann
|
709aba5783
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# application/models/organisation/Studiengang_model.php
|
2026-01-26 15:06:22 +01:00 |
|
|
Cristina
|
27a91de5f6
|
Added app lvevaluierung to system.tbl_app
|
2026-01-22 15:51:05 +01:00 |
|
|
Cristina
|
9b90e0edde
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-20 10:53:36 +01:00 |
|
|
Andreas Österreicher
|
47ea1e848c
|
Merge branch 'feature-69528/reihungstestueberwachung_constructor'
|
2026-01-19 10:17:38 +01:00 |
|
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|
|
Andreas Österreicher
|
47e3c83909
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-12-18 12:25:05 +01:00 |
|
|
ma0048
|
5a77478071
|
insertvon entfernt
|
2025-12-15 12:27:17 +01:00 |
|
|
Johann Hoffmann
|
635da9f8d9
|
checksystem paabgabetyp default values for upload_allowed, benotbar & aktiv only on first checksystem run by checking availability of qgate2 typ; english phrasen for betreuerart, paabgabetyp & projekttyp; disable new termin for zweitbetreuer (WIP disabling serientermin); QGate1/2 Status column -> text only for now;
|
2025-12-12 12:51:07 +01:00 |
|
|
Harald Bamberger
|
a86d35f731
|
Merge branch 'master' into feature-69065/Projektarbeiten_Firmen_verwalten
|
2025-12-11 12:12:05 +01:00 |
|
|
Alexei Karpenko
|
98bcbda53e
|
added check for Projektarbeitsbeurteilung when deleting Projektarbeit
|
2025-12-10 16:09:44 +01:00 |
|