Johann Hoffmann 4e6a2d5218 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4 ...

# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/views/CisRouterView/CisRouterView.php
#	cis/private/lehre/notenliste.xls.php
#	public/js/api/factory/lehre.js
#	public/js/apps/Cis/Cis.js
#	public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
#	public/js/helpers/StringHelpers.js
#	system/phrasesupdate.php

2026-07-27 15:41:29 +02:00

..

api

Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

2026-07-27 15:41:29 +02:00

Cis

Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

2026-07-27 15:41:29 +02:00

CisVue

Remove redundant Dashboardpage and load correct one in Users Landingpage

2026-04-08 14:27:56 +02:00

codex

uhstat form: moved constant down for better readability

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

components

stundenplan/lvplan use reverted classes and function names again

2025-06-17 11:05:31 +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 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning

2026-06-26 15:18:42 +02:00

lehre

- studsatus ablaeufe einzelen aktivieren/deaktivieren

2025-02-17 13:31:57 +01:00

organisation

fix file permissions erroneously commited as a21a292da6

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

person

Gruppenmanagement: added checks so only Gruppenmanager can edit groups

2024-12-10 12:03:58 +01:00

public/js

and another dependency of Tabs

2023-12-20 15:24:56 +01:00

system

Merge branch 'master' into feature-55978/infocenter_electronic_onboarding_filter

2025-11-03 12:57:41 +01: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

Studentenverwaltung.php

merge master into bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen

2026-02-02 16:31:13 +01: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