Damian Mooyman d52db0ba34 Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php		2016-04-29 17:50:55 +12:00
..
BasicAuthTest.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:48:07 +12:00
BasicAuthTest.yml	BUG Fix BasicAuth not resetting failed login counts on authentication	2014-10-24 14:19:12 +13:00
GroupCsvBulkLoaderTest_withExisting.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupCsvBulkLoaderTest.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupCsvBulkLoaderTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupTest.php	BUG Guard against users being added to all groups on unsaved Group.	2015-12-11 14:51:51 +13:00
GroupTest.yml	BUGFIX Nested Group records should be removed, along with the parent.	2012-03-28 22:49:58 +13:00
MemberAuthenticatorTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest_cleartextpws.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest_withGroups.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberCsvBulkLoaderTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
MemberTest.yml	Merge 3.3 into 3	2016-04-26 00:24:59 +01:00
PasswordEncryptorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PasswordValidatorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionCheckboxSetFieldTest.php	Replace core uses of DataObject::has_one/has_many/many_many	2015-03-13 16:16:12 +00:00
PermissionCheckboxSetFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
PermissionRoleTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionRoleTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
PermissionTest.php	Merge remote-tracking branch 'origin/3.3' into 3	2016-01-19 17:08:26 +13:00
PermissionTest.yml	FIX Members can access their own profiles in CMS	2015-08-26 15:47:51 +01:00
RandomGeneratorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SecurityDefaultAdminTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
SecurityTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
SecurityTokenTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00