Damian Mooyman 574bc6038b Merge 3 into master ... # Conflicts: # CONTRIBUTING.md # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.EditForm.js # admin/javascript/LeftAndMain.js # admin/scss/_forms.scss # dev/Debug.php # docs/en/05_Contributing/01_Code.md # forms/DropdownField.php # model/DataObject.php # model/Versioned.php # model/fieldtypes/DBLocale.php # tests/forms/gridfield/GridFieldExportButtonTest.yml # tests/model/MoneyTest.php # tests/model/MoneyTest.yml # tests/model/SQLQueryTest.php		2016-05-18 18:36:10 +12: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	Replaced obsolete mime types	2016-01-24 18:15:47 +13:00
CMSSecurity.php	Merge 3 into master	2016-05-11 15:19:35 +12:00
Group.php	FIX: Renaming to HTMLEditorConfig.	2016-05-06 14:16:34 +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 3.3 into 3	2016-05-11 14:06:23 +12:00
Member.php	Merge 3 into master	2016-05-18 18:36:10 +12:00
MemberAuthenticator.php	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
MemberCsvBulkLoader.php	parse the string to be converted to group codes.	2015-12-02 10:01:25 +05:30
MemberLoginForm.php	Removed Email Subclasses used by the Member class (Member_ChangePasswordEmail and Member_ForgotPasswordEmail).	2016-04-06 09:54:17 +02: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	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12: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	Revert #3425 #3396 to restore deprecated functionality	2015-08-24 11:26:25 +12:00
RememberLoginHash.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
Security.php	Merge branch '3'	2016-05-04 23:36:10 +01:00
SecurityToken.php	API Add CSRF to Campaign delete	2016-05-09 17:33:10 +12:00