Eric Lippmann cde3ec6bc8 Merge branch 'master' into bugfix/commands-6593 ...

Conflicts:
	modules/monitoring/application/controllers/TimelineController.php

2014-09-23 22:54:17 -07:00

..

ChartController.php

Merge branch 'master' into bugfix/rebuild-form-builder-5525

2014-09-09 16:03:22 +02:00

CommandController.php

Throw IcingaException rather than Exception

2014-08-27 16:03:15 +02:00

ConfigController.php

Rename ConfigForm::setConfig() to ConfigForm::setIniConfig()

2014-09-08 13:31:25 +02:00

HostController.php

monitoring: Add tabs to the host and service controller

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

HostsController.php

monitoring: Add new multiselection controllers

2014-09-23 22:47:26 -07:00

ListController.php

Merge branch 'master' into bugfix/commands-6593

2014-09-23 22:54:17 -07:00

MultiController.php

Merge branch 'master' into bugfix/rebuild-form-builder-5525

2014-08-20 13:13:50 +02:00

ProcessController.php

monitoring/commands: Use the toggle instance features command form in the process controller

2014-09-12 16:46:07 +02:00

ServiceController.php

monitoring: Add tabs to the host and service controller

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

ServicesController.php

monitoring: Add new multiselection controllers

2014-09-23 22:47:26 -07:00

ShowController.php

monitoring: Deprecate the host and service action of the `ShowController'

2014-09-23 22:37:14 -07:00

TacticalController.php

monitoring/tactical: fix missing translations

2014-08-22 18:08:20 +02:00

TimelineController.php

Merge branch 'master' into bugfix/commands-6593

2014-09-23 22:54:17 -07:00