Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php

2015-07-31 15:49:35 +12:00

..

Authenticator.php

Merge remote-tracking branch 'origin/3.1'

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

BasicAuth.php

Check both $_SERVER['HTTP_AUTHORIZATION'] and $_SERVER['REDIRECT_HTTP_AUTHORIZATION'] for HTTP Basic authentication headers

2015-03-17 14:15:54 +13:00

ChangePasswordForm.php

BUG Fix potential XSS injection

2015-07-01 17:41:32 +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

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12:00

Group.php

API make DataObject::validate public

2015-06-17 15:51:30 +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'

2015-07-31 15:49:35 +12: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' into 3

2015-06-02 19:13:38 +12: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

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

PermissionCheckboxSetField.php

DOCS Fixing docs (and bad API usage)

2015-07-20 16:42:33 +01: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

API Formalise new additional arguments to DataObject::canCreate, DataExtension::augmentSQL, and DataObject::extendedCan

2015-06-09 11:31:34 +12:00

PermissionRoleCode.php

API make DataObject::validate public

2015-06-17 15:51:30 +12:00

RandomGenerator.php

Remove all redundant whitespace

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

Security.php

DOCS: Typo in a block

2015-06-24 11:57:12 +01:00

SecurityToken.php

Remove all redundant whitespace

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