ma0048
855ec94445
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/css/Cis4/CoreCalendarEvents.css
# public/js/components/Calendar/Base.js
# public/js/components/Calendar/Base/Grid.js
# public/js/components/Calendar/Base/Header.js
# public/js/components/Calendar/Base/Header/Datepicker.js
# public/js/components/Calendar/Mode/Week.js
# system/phrasesupdate.php
# system/seeders/015_kalender.sql
# tests/cypress/.env.example
2026-10-15 15:07:52 +02:00
Harald Bamberger
3e06740758
add permissions cis/eigene_zeitsperren and cis/andere_zeitsperren and use them for zeitsperren and zeitsperrenma applications and api endpoints
2026-10-12 14:25:31 +02:00
ma0048
07f258248b
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# system/dbupdate_3.4.php
2026-10-01 14:02:32 +02:00
Harald Bamberger
e24a66a454
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-30 15:59:57 +02:00
Harald Bamberger
76a8e00edf
Merge branch 'master' into feature-77757/WidgetsBerechtigung
2026-09-30 15:23:08 +02:00
Harald Bamberger
9605227139
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-29 14:58:05 +02:00
ma0048
241eec3ef2
Merge remote-tracking branch 'origin/master' into feature-54225/reihungstest_ablauf_fuer_quereinsteiger
...
# Conflicts:
# cis/testtool/menu.php
# system/dbupdate_3.4.php
2026-09-23 11:29:43 +02:00
adisposkofh
43b849e787
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-22 13:44:49 +02:00
Ivymaster
bf050c9297
Dropped calender group id column from notizzuordnung and update migrateKalender commands
2026-09-17 11:02:35 +02:00
Ivymaster
e1af778d8f
Implemented custom table for kalender notiz, and added postgres triffer function for removing resources and stale notes
2026-09-11 14:27:17 +02:00
Ivymaster
260ede9d2f
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78220/titel-tals-tag-migrieren
2026-09-07 17:51:23 +02:00
Ivymaster
02ff8d0e3c
Conflicts resolved
2026-09-02 15:01:56 +02:00
Ivymaster
fd6d4095b9
Conflicts resolved
2026-09-01 13:22:46 +02:00
ma0048
eeb49e1967
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
2026-09-01 13:08:38 +02:00
ma0048
d727012806
Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# system/dbupdate_3.4.php
2026-09-01 12:32:38 +02:00
ma0048
61ef27e5eb
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
2026-09-01 12:20:12 +02:00
Ivymaster
61d7268f90
Conflicts resolved
2026-09-01 11:52:25 +02:00
ma0048
51886960bb
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
2026-08-31 12:49:28 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Harald Bamberger
16166db31a
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
2026-08-20 07:46:02 +02:00
ma0048
8184555e12
location hinzugefuegt
...
raumlose planung aktivierbar/deaktivierbar
automatische zuteilung zum priorraum aktivierbar/deaktivierbar
raum zuteilung ueber dialog aktivierbar/deaktivierbar
2026-08-13 13:36:35 +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
ma0048
b2aa4c4922
stundenraster mit eigener berechtigung basis/tempus_stundenraster deaktivierbar
2026-08-12 11:39:17 +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
Ivymaster
5d284c28e3
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:47:55 +02:00
Ivymaster
96526be231
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:43:20 +02:00
Ivymaster
a912fcf019
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:20: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
ma0048
8636364c08
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-77949/tempus_synchronisation
...
# Conflicts:
# system/dbupdate_3.4.php
2026-08-03 12:31:07 +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
Ivymaster
817afa545b
add tempus kalender tags
2026-07-22 15:52:31 +02:00
Johann Hoffmann
d40040efd8
added new fkey to tbl_widget for system.tbl_berechtigung; check for permission status during load & in widget picker; if widget was already picked/configured but not permitted anymore -> show a generalized "missing permission" screen via fallback component during widget init;
2026-07-21 18:14:26 +02:00
ma0048
9983a48102
gui fuer kalender sync hinzugefuegt und syncjob angepasst
2026-07-21 13:50:17 +02:00
Ivymaster
e09fea72a4
add resources assignment to tempus kalender entries
2026-07-17 09:09:49 +02:00
chfhtw
b0f317951b
Add lvv_favorites
2026-07-15 16:18:39 +02:00
ma0048
9abaf30ed3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/js/components/Calendar/Base/DragAndDrop.js
# public/js/components/Calendar/Base/Grid/Line.js
# public/js/composables/EventLoader.js
2026-07-15 15:48:44 +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
ma0068
fe8cf9bc83
new widget CIS4 MA Widget
...
- db-update for new widget studstatus
- different view for stgL and stgA
- update phrases
2026-06-11 15:34:45 +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
ma0048