Harald Bamberger fce72b1f91 fix merge conflicts after merging master

2022-03-28 11:59:26 +02:00

..

cache

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00

config

ÖH-Beitragsverwaltung: changed phrase Öhbeitragsverwaltung to correct ÖH-Beitragsverwaltung (in menu and GUI)

2021-10-29 16:06:38 +02:00

controllers

Merge branch 'master' into feature-16190/Issues_automatisches_Beheben

2022-02-28 13:07:06 +01:00

core

added public access modifier to interface (yes, this is actually necessary because mess detector is complaining...)

2022-02-28 12:57:10 +01:00

extensions

Added placeholder file to application/extensions

2019-04-01 16:35:07 +02:00

helpers

Fixed check in hlp_header_helper->printRefreshMeta function

2022-03-08 14:52:44 +01:00

hooks

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00

language

- codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc)

2019-07-31 14:46:31 +02:00

libraries

Merge branch 'master' into feature-16190/Issues_automatisches_Beheben

2022-02-28 13:07:06 +01:00

logs

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00

models

fix merge conflicts after merging master

2022-03-28 11:59:26 +02:00

third_party

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00

tmp

- Added 'system.tbl_extensions' => 'system/extensions' to config/fhcomplete.php

2017-11-13 13:00:17 +01:00

views

Spalte "Anzahl Dokumente" bei BPK-Übersicht

2022-03-16 16:04:58 +01:00

widgets

- Added requiredPermissions to the application/config/udfmasterschema.json and set them as mandatory

2021-09-07 12:13:59 +02:00

index.html

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00