Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163 ...

Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php

2014-10-08 16:34:31 +02:00

..

Authentication

Let the form decide where to get the resource configuration from

2014-09-29 11:06:16 +02:00

General

Add translation contexts to ambiguous form element labels

2014-10-02 16:34:44 +02:00

Resource

Merge branch 'master' into feature/setup-wizard-7163

2014-10-08 16:34:31 +02:00

AuthenticationBackendConfigForm.php

Improve form element description

2014-09-29 11:24:23 +02:00

AuthenticationBackendReorderForm.php

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

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

GeneralConfigForm.php

We shouldn't require Form::createElements() to return self

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

ResourceConfigForm.php

Merge branch 'master' into feature/setup-wizard-7163

2014-10-08 16:34:31 +02:00