Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php

2015-07-31 15:49:35 +12:00

..

GridField.php

DOCS Fixing docs (and bad API usage)

2015-07-20 16:42:33 +01:00

GridFieldAddExistingAutocompleter.php

FIX. Placeholder isn't completely translated

2015-01-15 14:15:03 +13: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 Fix false values for many_many_ExtraFields not being saved

2015-06-09 12:05:25 +12:00

GridFieldEditButton.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

GridFieldExportButton.php

Use fputcsv in GridFieldExportButton

2015-07-27 04:23:49 +02: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

Remove all redundant whitespace

2014-08-19 09:17:15 +12: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.1'

2014-11-18 12:45:54 +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