Cris 9d4482767b Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren ...

# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
#	public/js/lehre/lehrauftrag/orderLehrauftrag.js

2020-03-31 09:57:24 +02:00

..

cache

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

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

config

Added Inbox/Outbox Link to CI Page

2020-03-10 16:42:22 +01:00

controllers

Fixed Syntax Error in Phrases Page

2020-03-10 16:56:00 +01:00

core

- Added private method _checkHTTPS to core/FHC_Controller

2019-11-25 16:25:10 +01:00

extensions

Added placeholder file to application/extensions

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

helpers

Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user

2020-02-04 17:16:17 +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

- Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId

2020-02-26 17:22:59 +01:00

logs

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

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

models

Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung'

2020-03-02 16:03:28 +01: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 remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren

2020-03-31 09:57:24 +02:00

widgets

- Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId

2020-02-26 17:22:59 +01:00

index.html

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

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