Eric Lippmann 688a08585b Merge branch 'master' into bugfix/error-prone-generictts-9611 ...

Conflicts:
	modules/monitoring/application/views/scripts/show/components/downtime.phtml

2015-08-03 15:05:45 +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

Fix layout of action lincs in view

2015-05-28 15:31:50 +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

monitoring: Fix indent in the show/components/comments.phtml view script

2015-08-03 15:03:02 +02:00

contacts.phtml

Styling: re-organize and style comments

2015-06-03 15:35:50 +02:00

customvars.phtml

customvars.phtml: no header if no vars

2015-06-16 01:15:32 +02:00

downtime.phtml

Merge branch 'master' into bugfix/error-prone-generictts-9611

2015-08-03 15:05:45 +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

monitoring/object/show: default links for groups

2015-06-18 17:20:51 +02:00

notes.phtml

Resolve macros when accessing getters on MonitoredObjects

2015-05-28 15:01:10 +02:00

notifications.phtml

Repair command links

2015-06-10 14:29:44 +02:00

output.phtml

monitoring/show: choose fitting header tags

2015-06-16 00:35:32 +02:00

perfdata.phtml

perfdata: occupy more space, highglight like output

2015-06-18 11:39:55 +02:00

servicegroups.phtml

monitoring/object/show: default links for groups

2015-06-18 17:20:51 +02:00

status.phtml

Refactor acknowledgements, finally get rid of status component

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