Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163 ...

Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php

2014-10-08 16:34:31 +02:00

..

AuthenticationController.php

Merge branch 'master' into feature/setup-wizard-7163

2014-10-08 16:34:31 +02:00

ConfigController.php

Translation: another bunch of translatable strings

2014-09-29 15:20:19 +02:00

DashboardController.php

Use the new view script to show INI configuration in case of failures

2014-09-09 09:46:57 +02:00

ErrorController.php

ErrorController: Log exception and stacktrace

2014-09-01 10:00:04 +02:00

FilterController.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00

IndexController.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00

LayoutController.php

Only display custom menu renders on XHR requests and not in regular HTML

2014-09-09 15:33:42 +02:00

ListController.php

list: ooops

2014-09-05 15:33:34 +02:00

PreferenceController.php

Adjust Preferences/GeneralForm to use handleRequest() &. Co.

2014-09-05 10:21:24 +02:00

SearchController.php

SearchDashboard: rename ::load() to ::search()

2014-09-04 19:35:31 +02:00

SetupController.php

Let the setup's view scripts be a bit more generic

2014-10-06 16:04:58 +02:00

StaticController.php

StaticController: Fix img file inclusion

2014-09-08 12:59:22 +02:00