Damian Mooyman 46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 ... # Conflicts: # docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md # docs/en/02_Developer_Guides/14_Files/01_Image.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md # docs/en/03_Upgrading/index.md # docs/en/05_Contributing/01_Code.md # forms/TreeMultiselectField.php # security/Permission.php		2016-01-19 14:00:19 +13: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	Add missing packages	2015-08-24 16:15:38 +12:00
Group.php	display filtered roles when not an admin	2016-01-11 13:05:10 +13: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.2	2016-01-19 14:00: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' 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	Merge remote-tracking branch 'origin/3.1' into 3.2	2016-01-19 14:00:19 +13: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	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	Revert #3425 #3396 to restore deprecated functionality	2015-08-24 11:26:25 +12:00
Security.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-09-15 13:18:47 +12:00
SecurityToken.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00