Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1' ... Conflicts: .travis.yml README.md admin/code/LeftAndMain.php admin/css/screen.css admin/scss/screen.scss api/RestfulService.php conf/ConfigureFromEnv.php control/injector/ServiceConfigurationLocator.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php core/Object.php css/AssetUploadField.css css/ComplexTableField_popup.css dev/CSSContentParser.php dev/DevelopmentAdmin.php docs/en/changelogs/index.md docs/en/misc/contributing/code.md docs/en/reference/execution-pipeline.md filesystem/GD.php filesystem/ImagickBackend.php filesystem/Upload.php forms/Form.php forms/FormField.php forms/HtmlEditorConfig.php forms/gridfield/GridFieldDetailForm.php forms/gridfield/GridFieldSortableHeader.php lang/en.yml model/Aggregate.php model/DataList.php model/DataObject.php model/DataQuery.php model/Image.php model/MySQLDatabase.php model/SQLQuery.php model/fieldtypes/HTMLText.php model/fieldtypes/Text.php scss/AssetUploadField.scss search/filters/SearchFilter.php security/Authenticator.php security/LoginForm.php security/Member.php security/MemberAuthenticator.php security/MemberLoginForm.php security/Security.php tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php tests/control/HTTPTest.php tests/control/RequestHandlingTest.php tests/filesystem/UploadTest.php tests/forms/FormTest.php tests/forms/NumericFieldTest.php tests/model/DataListTest.php tests/model/DataObjectTest.php tests/model/TextTest.php tests/security/MemberAuthenticatorTest.php tests/security/SecurityDefaultAdminTest.php tests/view/SSViewerCacheBlockTest.php tests/view/SSViewerTest.php		2014-11-18 12:45:54 +13:00
..
Authenticator.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
BasicAuth.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ChangePasswordForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +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	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
Group.php	Removing deprecated class/functions marked for deprecation in 3.0/3.1	2014-08-25 12:06:05 +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.1'	2014-11-18 12:45:54 +13:00
MemberAuthenticator.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +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'	2014-11-18 12:45:54 +13: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	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionCheckboxSetField.php	Remove all redundant whitespace	2014-08-19 09:17:15 +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	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionRoleCode.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
RandomGenerator.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Security.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
SecurityToken.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00