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.php	BUGFIX: Use Object->hasMethod() instead of method_exists()	2015-11-01 09:10:29 +13:00
GridFieldAddExistingAutocompleter.php	FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.	2015-08-19 11:42:45 +01:00
GridFieldAddNewButton.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldButtonRow.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldComponent.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldConfig.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldDataColumns.php	FIX: Ensure that columns are unique within a gridfield	2014-09-01 21:50:36 +12:00
GridFieldDeleteAction.php	Revert "GridFieldDeleteAction missing button text without icons"	2015-06-19 17:43:05 +12:00
GridFieldDetailForm.php	BUG Replace direct reference to $_REQUEST['url'] with request object getter	2015-09-29 12:10:39 +13:00
GridFieldEditButton.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldExportButton.php	Merge branch '3'	2015-08-17 13:12:41 +01:00
GridFieldFilterHeader.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldFooter.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
GridFieldLevelup.php	Update asset admin toolbar	2015-10-23 17:39:42 +13:00
GridFieldPageCount.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldPaginator.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldPrintButton.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +12:00
GridFieldSortableHeader.php	Merge remote-tracking branch 'origin/3.2' into 3	2015-11-03 13:06:39 +13:00
GridFieldToolbarHeader.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldViewButton.php	Updating @package and @subpackage doc tags	2013-11-29 17:49:30 +13:00
GridState.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00