Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php

2015-02-20 10:17:19 +13:00

..

Authenticator.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

BasicAuth.php

Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule

2014-12-05 11:35:52 +13:00

ChangePasswordForm.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

CMSMemberLoginForm.php

API Enable re-authentication within the CMS if a user session is lost

2014-10-14 15:19:48 +13:00

CMSSecurity.php

Merge remote-tracking branch 'composer/3.1' into 3

2015-01-15 18:52:46 +13:00

Group.php

Removing deprecated class/functions marked for deprecation in 3.0/3.1

2014-08-25 12:06:05 +12:00

GroupCsvBulkLoader.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

LoginAttempt.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

LoginForm.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

Member.php

Merge remote-tracking branch 'origin/3.1' into 3

2015-02-20 10:17:19 +13:00

MemberAuthenticator.php

Merge remote-tracking branch 'composer/3.1' into 3

2015-01-15 18:52:46 +13:00

MemberCsvBulkLoader.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

MemberLoginForm.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

MemberPassword.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PasswordEncryptor.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PasswordValidator.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Permission.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PermissionCheckboxSetField.php

Merge remote-tracking branch 'origin/3.1' into 3

2015-02-20 10:17:19 +13:00

PermissionFailureException.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PermissionProvider.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

PermissionRole.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PermissionRoleCode.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

RandomGenerator.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Security.php

Merge remote-tracking branch 'origin/3.1'

2014-11-19 11:16:46 +13:00

SecurityToken.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00