Johann Hoffmann d9f5646ad1 Merge branch 'master' into feature-40896/kennzeichnung_unruly_person ...

# Conflicts:
#	application/models/crm/Prestudentstatus_model.php
#	public/js/api/fhcapifactory.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php

2024-09-10 10:17:55 +02:00

..

cache

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

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

components

bismeldestichtage gui: removed filters, now just simple tabulator

2023-07-07 02:12:14 +02:00

config

Added config variable $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)

2024-07-11 10:44:12 +02:00

controllers

Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

2024-09-10 10:17:55 +02:00

core

remove unused Abstract_Searchbar_Controller

2024-08-13 16:42:09 +02:00

extensions

Added placeholder file to application/extensions

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

helpers

backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch

2024-07-11 11:57:45 +02:00

hooks

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

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

language

backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch

2024-07-11 11:57:45 +02:00

libraries

Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

2024-09-10 10:17:55 +02:00

logs

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

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

models

Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

2024-09-10 10:17:55 +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

Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

2024-09-10 10:17:55 +02:00

widgets

Fixes: code quality checks

2023-04-25 16:07:42 +02:00

index.html

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

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