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

..

acknowledgement.phtml

Revert "Adjust command links so that they'll use host_name' instead of host'"

2015-04-20 16:11:08 +02:00

actions.phtml

Add ServiceActionsHook

2015-05-18 11:45:39 +02:00

checksource.phtml

Show reachability in the host and service detail view

2015-03-13 00:26:45 +01:00

checkstatistics.phtml

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

command.phtml

Revert "Adjust command links so that they'll use host_name' instead of host'"

2015-04-20 16:11:08 +02:00

comments.phtml

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

contacts.phtml

Revert "ContactQuery: Provide ci query columns for aliases and email addresses"

2015-04-10 12:23:35 +02:00

customvars.phtml

Show custom variables visually separated in the host and service detail views

2015-04-23 13:31:02 +02:00

downtime.phtml

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

flags.phtml

monitoring/commands: Let detail snippets use the new command forms

2014-09-12 16:52:45 +02:00

flapping.phtml

Enable icon font

2014-11-13 20:08:58 +01:00

grapher.phtml

Fix form CSS

2014-09-23 22:43:33 -07:00

hostgroups.phtml

Use hostgroup_name' instead of hostgroup' to filter hosts and services

2015-04-09 11:43:21 +02:00

notifications.phtml

Revert "Adjust command links so that they'll use host_name' instead of host'"

2015-04-20 16:11:08 +02:00

output.phtml

monitoring: Translate "Plugin Output"

2014-11-21 16:45:39 +01:00

perfdata.phtml

New object detail snippets

2014-03-06 18:36:26 +00:00

servicegroups.phtml

Use servicegroup_name' instead of servicegroup' to filter services

2015-04-09 11:43:51 +02:00

status.phtml

Refactor acknowledgements, finally get rid of status component

2014-03-08 21:28:32 +01:00