Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php

2015-03-31 19:54:15 +13:00

..

GridField.php

Merge remote-tracking branch 'origin/3.1' into 3

2015-03-11 11:40:06 +13: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

GridFieldDeleteAction missing button text without icons

2014-09-01 21:58:07 +12:00

GridFieldDetailForm.php

Merge remote-tracking branch 'origin/3.1' into 3

2015-03-31 19:54:15 +13:00

GridFieldEditButton.php

Remove all redundant whitespace

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

GridFieldExportButton.php

checking for destroy

2015-02-21 23:03:34 +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

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-02-20 10:17:19 +13: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