Daniel Hensby ca8d0f2818 Merge branch '3.1' into 3.2 ... Conflicts: dev/Debug.php docs/en/05_Contributing/01_Code.md forms/FormField.php i18n/i18nTextCollector.php model/DataQuery.php		2015-07-20 10:48:01 +01: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 Revert DataObject::validate to 3.1 method signature (protected)	2015-06-16 11:59:21 +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	FIX MemberPassword history removed with with Members	2015-06-24 21:04:23 +01: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	Replace core uses of DataObject::has_one/has_many/many_many	2015-03-13 16:16:12 +00: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	API Revert DataObject::validate to 3.1 method signature (protected)	2015-06-16 11:59:21 +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