Simon Welsh d431e98ecf Merge branch '3.1' ...

Conflicts:
	forms/Form.php
	forms/FormField.php
	security/Member.php
	security/MemberLoginForm.php

2014-03-10 22:58:49 +13:00

..

GridField.php

Merge branch '3.1'

2014-03-10 22:58:49 +13:00

GridFieldAddExistingAutocompleter.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

GridFieldAddNewButton.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldButtonRow.php

Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list

2014-01-31 15:15:59 +13:00

GridFieldComponent.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldConfig.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

GridFieldDataColumns.php

Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list

2014-01-31 15:15:59 +13:00

GridFieldDeleteAction.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldDetailForm.php

Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list

2014-01-31 15:15:59 +13:00

GridFieldEditButton.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldExportButton.php

Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list

2014-01-31 15:15:59 +13:00

GridFieldFilterHeader.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

GridFieldFooter.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldLevelup.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldPageCount.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldPaginator.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

GridFieldPrintButton.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldSortableHeader.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

GridFieldToolbarHeader.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridFieldViewButton.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

GridState.php

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00