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

..

api

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-10-15 15:07:52 +02:00

Cis

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

CisVue

removing obsolete use of viewData prop

2026-09-18 14:06:27 +02:00

codex

uhstat form: moved constant down for better readability

2025-09-02 15:09:15 +02:00

components

Merge branch 'master' into cis40_2026-05_ma_rc

2026-08-13 17:36:38 +02:00

crm

fix file permissions erroneously commited as a21a292da6

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

dashboard

rename dashboard admin controller and views

2026-03-23 11:47:28 +01:00

extensions

fix file permissions erroneously commited as a21a292da6

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

jobs

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-10-01 14:02:32 +02:00

js

Add dynamic tabulatorcolumns to lvverwaltung

2026-07-15 11:05:37 +02:00

lehre

Merge branch 'master' into cis40_2026-05_ma_rc

2026-08-13 17:36:38 +02:00

organisation

fix file permissions erroneously commited as a21a292da6

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

person

use checks for param studiengang_kurzbz instead of deleting it

2026-04-24 09:20:37 +02:00

public/js

…

system

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-10-01 14:02:32 +02:00

widgets

fix file permissions erroneously commited as a21a292da6

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

Cis4.php

removed use of viewData object as passed by controller thru routerview to component -- component fetches data instead

2026-04-16 15:49:16 +02:00

Documents.php

NotenTab: Phrases

2024-12-27 14:44:53 +01:00

index.html

fix file permissions erroneously commited as a21a292da6

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

LVVerwaltung.php

lehrfächerverteilung v1

2025-05-28 07:51:10 +02:00

NeueNachricht.php

modify using open mode newTab or window with multiple Recipients via post request

2025-12-02 07:54:13 +01:00

Redirect.php

App urls for studierendenverwaltung (neu: /studvw)

2026-07-03 12:16:30 +02:00

Studentenverwaltung.php

merge master into bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen

2026-02-02 16:31:13 +01:00

Tempus.php

Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur

2026-09-01 12:32:38 +02:00

Vertragsverwaltung.php

adapt headerFilter, remove frontend filter, add backend filter aktiv mitarbeiter

2025-09-02 20:29:23 +02:00

Vilesci.php

fix file permissions erroneously commited as a21a292da6

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