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

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

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

bin

Update the monitoring module

2013-07-12 14:33:17 +02:00

config

Fix use of already replaced class Icinga\Web\Session

2013-06-28 09:13:08 +02:00

library/Monitoring

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

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

test/php

Host detail view: Add tests for properties

2013-07-08 16:12:47 +02:00