icingaweb2

mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-26 19:29:00 +02:00

History

Jannis Moßhammer b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179

Conflicts:
	application/layouts/scripts/layout.phtml
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/contacts.phtml
	modules/monitoring/application/views/scripts/show/components/customvars.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

2013-07-12 15:55:31 +02:00

application

Fix QlinkTest

2013-06-28 11:17:34 +02:00

bin

Move tested existing resources to new productive repository

2013-06-04 10:20:51 +02:00

library/Icinga

Update Livestatus tests

2013-07-12 14:02:43 +02:00

regression

Integrate regression tests