Damian Mooyman 8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # admin/scss/_tree.scss # javascript/TreeDropdownField.js		2016-01-19 17:08:26 +13:00
..
Authenticator.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
BasicAuth.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ChangePasswordForm.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CMSMemberLoginForm.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CMSSecurity.php	Merge remote-tracking branch 'origin/3.2' into 3	2015-09-09 14:50:47 +12:00
Group.php	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-01-19 15:08:24 +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	MINORE: Remove training whitespace.	2016-01-07 10:15: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	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoader.php	parse the string to be converted to group codes.	2015-12-02 10:01:25 +05:30
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.3' into 3	2016-01-19 17:08:26 +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	API Disable get parameter access to site stage mode	2015-12-07 17:39:18 +13:00
SecurityToken.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00