Damian Mooyman 574bc6038b Merge 3 into master ... # Conflicts: # CONTRIBUTING.md # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.EditForm.js # admin/javascript/LeftAndMain.js # admin/scss/_forms.scss # dev/Debug.php # docs/en/05_Contributing/01_Code.md # forms/DropdownField.php # model/DataObject.php # model/Versioned.php # model/fieldtypes/DBLocale.php # tests/forms/gridfield/GridFieldExportButtonTest.yml # tests/model/MoneyTest.php # tests/model/MoneyTest.yml # tests/model/SQLQueryTest.php		2016-05-18 18:36:10 +12:00
..
GridField.php	FIX add_i18n_javascript calls not being updated after JS move	2016-05-09 15:41:24 +12:00
GridFieldAddExistingAutocompleter.php	BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton	2016-05-03 17:45:46 +12: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	Merge 3 into master	2016-04-29 17:50:55 +12:00
GridFieldEditButton.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GridFieldExportButton.php	Merge 3 into master	2016-05-18 18:36:10 +12: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	FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192)	2016-04-26 09:34:03 +01:00
GridFieldPrintButton.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12: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