Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458 ... Conflicts: application/views/scripts/config/application.phtml application/views/scripts/config/module.phtml application/views/scripts/config/modules.phtml library/Icinga/Web/Widget/Dashboard/Dashlet.php modules/monitoring/application/controllers/TimelineController.php		2015-02-24 08:42:36 +01:00
..
AuthenticationController.php	Display authentication exceptions as form errors	2015-02-12 09:11:03 +01:00
ConfigController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
DashboardController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
ErrorController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
FilterController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
IndexController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
LayoutController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
ListController.php	Add proper titles to the list view's tabs	2015-02-23 17:00:30 +01:00
PreferenceController.php	Add proper titles to all config tabs	2015-02-23 16:50:31 +01:00
RolesController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
SearchController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
StaticController.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00