Eric Lippmann 9e0d6657b7 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593 ...

Conflicts:
	application/forms/Preference/GeneralForm.php

2014-09-15 09:27:07 +02: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

ListController.php

list/eventhistory: sort by timestamp, not raw_ts

2014-09-05 18:44:29 +02:00

MonitoringCommands.php

Remove leading backslashes from the targets of use statements

2014-08-27 15:51:49 +02: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/commands: Introduce `ServiceController'

2014-09-12 16:50:42 +02:00

ShowController.php

monitoring/show: provide summary data to views

2014-09-05 18:03:45 +02:00

TacticalController.php

monitoring/tactical: fix missing translations

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

TimelineController.php

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

2014-09-08 08:46:53 +02:00