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
..
GridField_URLHandlerTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldActionTest.yml	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
GridFieldAddExistingAutocompleterTest.php	FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.	2015-08-19 11:42:45 +01:00
GridFieldConfigTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldDataColumnsTest.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
GridFieldDeleteActionTest.php	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-18 17:28:54 +13:00
GridFieldDetailFormTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridFieldDetailFormTest.yml	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
GridFieldEditButtonTest.php	Making docs gender agnostic	2015-03-07 12:32:04 +00:00
GridFieldExportButtonTest.php	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
GridFieldExportButtonTest.yml	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
GridFieldPaginatorTest.php	FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192)	2016-04-26 09:34:03 +01:00
GridFieldPrintButtonTest.php	BUG Fix print button only displaying first page	2015-11-12 14:59:08 +13:00
GridFieldSortableHeaderTest.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
GridFieldSortableHeaderTest.yml	API Enable DataList::sort to support composite field names (similar to filter)	2015-12-01 09:35:33 +13:00
GridFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00