Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009 ... Conflicts: modules/monitoring/application/controllers/ShowController.php modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php		2015-06-16 17:12:51 +02:00
..
alertsummary	Alertsummary: Ensure dashboard compliance	2015-04-17 16:09:50 +02:00
chart	Add logarithmic AxisUnit	2015-01-13 17:56:50 +01:00
comment	monitoring: Fix date and time formatting for comments	2015-05-22 10:22:14 +02:00
comments	Streamline layout of all multi-views	2015-05-18 17:17:30 +02:00
config	Config: Use native form title and description support where appropriate	2015-03-02 18:40:47 +01:00
downtime	monitoring: Fix duration, date and time formatting for downtimes	2015-05-22 10:06:55 +02:00
downtimes	Streamline layout of all multi-views	2015-05-18 17:17:30 +02:00
host	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
hosts	Display acknowledgement action for all unacknowledged objects	2015-06-01 12:24:29 +02:00
list	Behave nicely when showing notifications not sent out to any contact	2015-06-16 13:32:35 +02:00
partials	monitoring: Don't add class active to followed links of a host's service summary	2015-06-02 10:06:54 +02:00
process	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
service	MonitoredObjectController: Add historyAction	2015-06-16 17:04:36 +02:00
services	Improve .ini file formatting	2015-06-01 16:12:02 +02:00
show	ShowController: Deprecate historyAction	2015-06-16 17:05:41 +02:00
tactical	Revert "Merge branch 'feature/organize-headings-7976'"	2015-03-12 16:08:34 +01:00
timeline	Timeline: Fix url used to extend the timeline	2015-06-09 09:17:15 +02:00