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

Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php

2014-09-08 10:16:05 +02:00

..

ChartController.php

Merge branch 'master' into bugfix/commands-6593

2014-09-03 23:23:20 +02:00

CommandController.php

Throw IcingaException rather than Exception

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

ConfigController.php

Move Icinga\Form\Config\ConfirmRemovalForm to Icinga\Form

2014-09-01 15:11:09 +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

Remove license headers from all files

2014-07-15 13:43:52 +02:00

ServiceController.php

monitoring: Introduce `ServiceController'

2014-09-04 15:43:37 +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

DateTime: Remove global and user formattings

2014-09-04 16:02:10 +02:00