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

Conflicts:
	library/Icinga/Web/Form.php
	modules/monitoring/application/forms/Config/SecurityForm.php

2014-08-28 13:58:02 +02:00

..

ChartController.php

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

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

CommandController.php

ConfigurationError: extend IcingaException

2014-08-22 11:46:11 +02:00

ConfigController.php

Avoid NIH

2014-08-22 12:30:13 +02:00

ListController.php

list/hosts: add missing host_attempt column

2014-08-22 05:23:45 -04:00

MonitoringCommands.php

Prefer style="clear: both;" rather than Bootstrap's class="clearfix"

2014-07-17 17:46:28 +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

ShowController.php

Add contact detail view

2014-07-18 17:35:24 +02:00

TacticalController.php

monitoring/tactical: fix missing translations

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

TimelineController.php

Web\Window: fix it's usage, add helper function

2014-06-22 13:21:21 +02:00