Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Johann Hoffmann
46f8d0d07d
remove all remaining projektarbeit-lehreinheit joins across the codebase;
...
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.
Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php
tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
Werner Masik
d85a3cb08f
extract DB migration for gehaltsanpassungtyp into separate file
2026-08-12 15:18:35 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Harald Bamberger
e9fc0629f5
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973
2026-08-03 16:06:34 +02:00
Harald Bamberger
02a97fb0e2
Merge branch 'feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen' into studvw_2026_08_rc
2026-07-28 15:35:54 +02:00
adisposkofh
89ea4187fa
merged master into
2026-07-27 15:58:08 +02:00
chfhtw
0e099b2752
Remove deprecated files and lv_favorites variable
2026-07-24 14:05:50 +02:00
chfhtw
b0f317951b
Add lvv_favorites
2026-07-15 16:18:39 +02:00
Harald Bamberger
7e6d670d82
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-13 14:32:51 +02:00
Harald Bamberger
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +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
Johann Hoffmann
df46b8ebdd
Merge remote-tracking branch 'origin/master' into feature-75469/LeOptional4Projektarbeit
2026-06-16 10:46:44 +02:00
adisposkofh
0bb81b23e5
implemented table presets functionality
2026-06-09 16:07:55 +02:00
Andreas Österreicher
30b8a406a5
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
2026-06-01 09:10:35 +02:00
Johann Hoffmann
870c36e76b
Merge remote-tracking branch 'origin/master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# system/dbupdate_3.4.php
2026-05-20 16:22:31 +02:00
Harald Bamberger
8b2ef4e832
Merge branch 'master' into feature-75959/StudVw_Automatische_Tags
2026-05-11 10:54:26 +02:00
ma0068
e5e22931a9
add db queries for update system, update tags in config
2026-04-24 12:49:00 +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
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
adisposkofh
7daaf79fcc
implemented permission for viewing other users' lv plans
2026-04-13 15:44:09 +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
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
Johann Hoffmann
d1af44bcdc
dbupdate entry; WIP table altering statements for lehre.tbl_projektarbeit
2026-03-05 17:33:18 +01:00
Werner Masik
41b2a6d1d4
added db migration for lohnguide
2026-03-04 10:53:30 +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
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
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
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
Cristina
76cdaefdc7
Merge branch 'master' into epic-56039/LV-Evaluierung
2025-12-09 17:06:06 +01:00
Johann Hoffmann
bb689a6d48
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
...
# Conflicts:
# public/css/Cis4/Cis.css
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-12-09 17:03:18 +01:00
Andreas Österreicher
e1959b9e40
Quality Gate Aenderungen im DBUpdate hinzugefügt
2025-12-05 13:21:46 +01:00
ma0048
5c9710f44d
externe ueberwachung v1
2025-12-02 13:49:05 +01:00
Cristina
4ab0c0a44e
Merge branch 'master' into epic-56039/LV-Evaluierung
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-11-13 10:44:39 +01:00
chfhtw
77604c5e15
StV: Font Size setting
2025-11-12 08:02:06 +01:00
Harald Bamberger
c97e1b6453
Merge branch 'feature-67490/studstatus_suche_abort_controller_haengt'
2025-11-05 11:06:32 +01:00
ma0068
9c8a1f564e
add sort functionality to bookmark widget
2025-10-29 09:52:11 +01:00
Andreas Österreicher