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
..
AlertsummaryController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
ChartController.php	Support aria markup in SVG charts	2015-02-17 17:41:05 +01:00
ConfigController.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
HostController.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
HostsController.php	Add proper titles to the multi selection controller tabs	2015-02-23 16:57:32 +01:00
ListController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
ProcessController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
ServiceController.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
ServicesController.php	Add proper titles to the multi selection controller tabs	2015-02-23 16:57:32 +01:00
ShowController.php	Add proper titles to all host/service tabs	2015-02-23 16:56:49 +01:00
TacticalController.php	Add proper title to the tactical overview's tab	2015-02-23 16:58:48 +01:00
TimelineController.php	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00