Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/hostgroups.phtml modules/monitoring/application/views/scripts/process/info.phtml modules/monitoring/application/views/scripts/show/components/downtime.phtml modules/monitoring/application/views/scripts/show/components/notifications.phtml modules/monitoring/public/css/module.less		2015-05-21 14:57:01 +02:00
..
AlertsummaryController.php	Drop interface Browsable	2015-05-15 14:37:41 +02:00
ChartController.php	Implement and use Hostgroupsummary and Servicegroupsummary	2015-05-19 18:17:40 +02:00
CommentController.php	Fix redirects after deleting a comment	2015-05-07 17:02:34 +02:00
CommentsController.php	Streamline layout of all multi-views	2015-05-18 17:17:30 +02:00
ConfigController.php	Inherit from Icinga\Web\Controller rather than from Icinga\Web\Controller\ModuleActionController	2015-04-08 15:13:59 +02:00
DowntimeController.php	Conform to coding guidelines	2015-05-07 17:23:50 +02:00
DowntimesController.php	Streamline layout of all multi-views	2015-05-18 17:17:30 +02:00
HostController.php	Add ServiceActionsHook	2015-05-18 11:45:39 +02:00
HostsController.php	Display icon_images in all host and service detail views	2015-05-19 18:08:26 +02:00
ListController.php	monitoring: Fix sort control columns for the service group summary	2015-05-21 12:42:53 +02:00
ProcessController.php	Show icinga program version in Monitoring Health	2015-05-05 17:02:45 +02:00
ServiceController.php	Add ServiceActionsHook	2015-05-18 11:45:39 +02:00
ServicesController.php	Deduplicate code and fix layout	2015-05-21 11:40:08 +02:00
ShowController.php	ShowController: Use a default limit of 50 for an object's history listing	2015-05-15 15:23:49 +02:00
TacticalController.php	Tactical overview: Add dashboard action	2015-04-20 14:59:54 +02:00
TimelineController.php	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00