Eric Lippmann 11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998 ...

Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php

2015-06-05 15:27:42 +02:00

..

Backend

Merge branch 'master' into feature/user-and-group-management-8826

2015-06-02 10:44:13 +02:00

Cli

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Command

Merge branch 'master' into feature/user-and-group-management-8826

2015-06-02 10:44:13 +02:00

DataView

Merge branch 'master' into feature/user-and-group-management-8826

2015-05-22 10:06:31 +02:00

Exception

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Object

Display acknowledgement action for all unacknowledged objects

2015-06-01 12:24:29 +02:00

Plugin

Do not display columns that don't include any values

2015-06-02 15:20:27 +02:00

Timeline

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Web

monitoring: Remove the services tab when showing host or service details

2015-05-28 12:22:57 +02:00

Backend.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

BackendStep.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Controller.php

Monitoring\Controller: Drop `compactView' property, as it's not used anywere

2015-04-15 15:17:59 +02:00

Environment.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

InstanceStep.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

MonitoringWizard.php

Add todo to the MonitoringWizard related to the livestatus backend type

2015-03-10 11:00:51 +01:00

Plugin.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

SecurityStep.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00