Eric Lippmann 11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998 ... Conflicts: application/controllers/ConfigController.php library/Icinga/Web/Widget/FilterEditor.php modules/monitoring/application/controllers/HostsController.php		2015-06-05 15:27:42 +02:00
..
components	monitoring: Readd link to all configured hosts	2015-06-01 17:25:10 +02:00
comments.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
contactgroups.phtml	list/contactgroups: Ensure dashboard compliance	2015-04-17 16:14:13 +02:00
contacts.phtml	list/contacts: Ensure dashboard compliance	2015-04-17 16:13:56 +02:00
downtimes.phtml	monitoring: Fix wrong partial time when a downtime expires	2015-05-22 16:50:24 +02:00
eventgrid.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
eventhistory.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
hostgroups.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
hosts.phtml	monitoring: Fix link to unhandled services of a host	2015-06-02 10:07:13 +02:00
notifications.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
servicegrid.phtml	monitoring: Fix link to a host's services in the service grid	2015-06-02 10:07:43 +02:00
servicegroups.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
services.phtml	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00