Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.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/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss		2016-02-25 14:51:59 +13:00
..
GridField.php	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +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	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridFieldDeleteAction.php	Revert "GridFieldDeleteAction missing button text without icons"	2015-06-19 17:43:05 +12:00
GridFieldDetailForm.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
GridFieldEditButton.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldExportButton.php	GridField export and print buttons updated to new style	2016-02-22 10:03:39 +13: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	GridField export and print buttons updated to new style	2016-02-22 10:03:39 +13:00
GridFieldSortableHeader.php	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +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