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

..

Erhalter_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Fachbereich_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Ferien_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Geschaeftsjahr_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Gruppe_model.php

- added reservierungen

2026-04-28 20:17:50 +02:00

Lehrverband_model.php

- added reservierungen

2026-04-28 20:17:50 +02:00

Organisationseinheit_model.php

wrote Studiengang_model.php -> getAssistenzForStudiengangKZ() that does just that but is not used currently since we retrieve assistenz in AbgabetoolJob.php via oe_kurzbz; added new getAssistenzForOE() method in Organisationseinheit_model; added new job "notifyAssistenzAboutChangedAbgaben" that does just that to AbgabetoolJob.php; removed console.log/debugger statements in cis4 code;

2026-01-19 16:12:54 +01:00

Organisationseinheittyp_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Semesterwochen_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Service_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Standort_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Statistik_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Studiengang_model.php

merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09

2026-09-16 16:31:56 +02:00

Studiengangstyp_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Studienjahr_model.php

Added / Adapted Model queries and api Controller regarding for Lehrveranstaltung- and Studienjahr Model

2025-03-06 09:40:40 +01:00

Studienordnung_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Studienordnungstatus_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Studienplan_model.php

Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

2025-11-25 10:50:26 +01:00

Studienplatz_model.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

Studiensemester_model.php

Merge branch 'master' into cis40_2026-09_ma_rc

2026-10-05 13:11:02 +02:00