30040eaa1b
This is merge to prevent the host-overview nad host-detail branch from diverging too much refs #4179 Conflicts: application/views/helpers/TimeSince.php modules/monitoring/application/controllers/ShowController.php modules/monitoring/application/views/scripts/show/components/comments.phtml modules/monitoring/application/views/scripts/show/header.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 public/css/base.less public/css/components/details.less |
||
---|---|---|
.. | ||
components | ||
header.phtml | ||
history.phtml | ||
host.phtml | ||
legacy-service.phtml | ||
service.phtml | ||
services.phtml | ||
ticket.phtml |