Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3' ... Conflicts: control/Director.php filesystem/File.php filesystem/GD.php filesystem/ImagickBackend.php forms/HtmlEditorField.php javascript/UploadField_uploadtemplate.js model/Image.php model/Image_Backend.php model/fieldtypes/Enum.php templates/AssetUploadField.ss tests/model/ImageTest.php tests/search/FulltextFilterTest.php		2015-11-03 14:23:16 +13:00
..
GridField_URLHandlerTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldActionTest.yml	Remove Spyc YAML library	2015-10-19 17:07:34 +01: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	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldDetailFormTest.php	FIX: GridFieldDetailForm failing to save many_many relations	2015-09-22 14:46:57 +01:00
GridFieldDetailFormTest.yml	Remove Spyc YAML library	2015-10-19 17:07:34 +01:00
GridFieldEditButtonTest.php	Making docs gender agnostic	2015-03-07 12:32:04 +00:00
GridFieldExportButtonTest.php	Use fputcsv in GridFieldExportButton	2015-07-27 04:23:49 +02:00
GridFieldExportButtonTest.yml	Remove Spyc YAML library	2015-10-19 17:07:34 +01:00
GridFieldPaginatorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldSortableHeaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldSortableHeaderTest.yml	Remove Spyc YAML library	2015-10-19 17:07:34 +01:00
GridFieldTest.yml	Remove Spyc YAML library	2015-10-19 17:07:34 +01:00