Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ...

Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php

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

..

ChartController.php

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

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

CommandController.php

Remove license headers from all files

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

ConfigController.php

Merge EditInstanceForm with CreateInstanceForm and rename it

2014-08-11 14:49:42 +02:00

ListController.php

Merge branch 'master' into bugfix/styled-history-views-6637

2014-08-20 11:39:03 +02: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/controllers: filter-related cleanup

2014-06-17 13:48:26 +00:00

TimelineController.php

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

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