Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/configuration.php		2015-09-15 13:31:30 +02:00
..
AboutController.php	Optimize imports in the AboutController	2015-08-27 13:07:10 +02:00
AuthenticationController.php	Use Request::setBody() for cookies disabled message	2015-08-27 13:21:43 +02:00
ConfigController.php	Merge branch 'master' into feature/namespaced-controllers-5786	2015-08-27 15:05:44 +02:00
DashboardController.php	Rename controller namespace to Controllers	2015-08-27 13:03:45 +02:00
ErrorController.php	api: Use JsonResponse in the ErrorController	2015-09-07 13:37:00 +02:00
GroupController.php	Merge branch 'master' into feature/namespaced-controllers-5786	2015-08-27 15:05:44 +02:00
IndexController.php	Add TODO in the IndexController: Avoid landing page redirects	2015-08-27 13:32:35 +02:00
LayoutController.php	Use the new navigation to render the menu	2015-09-04 10:53:01 +02:00
ListController.php	Fix PHPDoc of ListController	2015-08-27 13:35:06 +02:00
NavigationController.php	NavigationController: Allow the owner to edit/remove a shared item	2015-09-07 16:27:27 +02:00
PreferenceController.php	Add PreferenceController renaming TODO	2015-08-27 13:38:19 +02:00
RoleController.php	Fix array indent in RoleController::createListTabs()	2015-08-27 14:05:05 +02:00
SearchController.php	Namespace the SearchController	2015-08-27 14:05:32 +02:00
StaticController.php	Static content: Fix check whether an image exists	2015-08-28 13:14:33 +02:00
UserController.php	Merge branch 'master' into feature/namespaced-controllers-5786	2015-08-27 15:05:44 +02:00
UsergroupbackendController.php	Merge branch 'master' into feature/namespaced-controllers-5786	2015-08-27 15:05:44 +02:00