Cris b549622f50 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite ...

# Conflicts:
#	application/models/organisation/Studiensemester_model.php
#	system/phrasesupdate.php

2024-11-27 17:44:45 +01:00

..

cache

fix file permissions erroneously commited as a21a292da6

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

components

fix file permissions erroneously commited as a21a292da6

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

config

move contentid of cis4 menu root to ci config, remove unused controller components CisVue, modify CISVUE-Header to use config for cis4 menu root content id

2024-11-22 15:16:27 +01:00

controllers

Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite

2024-11-27 17:44:45 +01:00

core

fix(FHCAPI_Controller): adjusts the php doc types of parameters

2024-11-19 11:35:20 +01:00

extensions

fix file permissions erroneously commited as a21a292da6

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

helpers

fix file permissions erroneously commited as a21a292da6

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

hooks

fix file permissions erroneously commited as a21a292da6

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

language

fix file permissions erroneously commited as a21a292da6

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

libraries

search only for active orgunits and rooms, also search room description

2024-11-19 17:33:57 +01:00

logs

fix file permissions erroneously commited as a21a292da6

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

models

Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite

2024-11-27 17:44:45 +01:00

third_party

fix file permissions erroneously commited as a21a292da6

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

tmp

fix file permissions erroneously commited as a21a292da6

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

views

Merge branch 'master' into feature-8482/Pruefungsprotokoll_zur_Einsicht_exportieren

2024-11-27 13:44:24 +01:00

widgets

fix file permissions erroneously commited as a21a292da6

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

index.html

fix file permissions erroneously commited as a21a292da6

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