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

Merge remote-tracking branch 'origin/3'

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

CheckboxField.php

Remove all redundant whitespace

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

CheckboxSetField.php

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

2015-06-19 10:48:07 +12:00

CompositeField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

ConfirmedPasswordField.php

DOCS Fixing docs (and bad API usage)

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

CountryDropdownField.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

CreditCardField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

CurrencyField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

DatalessField.php

DOCS Fixing docs (and bad API usage)

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

DateField.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

DatetimeField.php

DOCS Fixing docs (and bad API usage)

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

DisabledTransformation.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

DropdownField.php

DOCS Fixing docs (and bad API usage)

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

EmailField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

FieldGroup.php

Remove all redundant whitespace

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

FieldList.php

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

2015-06-02 19:13:38 +12:00

FileField.php

DOCS Fixing docs (and bad API usage)

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

Form.php

Merge remote-tracking branch 'origin/3'

2015-06-17 15:41:13 +12:00

FormAction.php

DOCS Fixing docs (and bad API usage)

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

FormField.php

Merge remote-tracking branch 'origin/3'

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

FormScaffolder.php

Replace core uses of DataObject::has_one/has_many/many_many

2015-03-13 16:16:12 +00:00

FormTemplateHelper.php

Remove all redundant whitespace

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

FormTransformation.php

Remove all redundant whitespace

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

GroupedDropdownField.php

FIX: DropdownField didn't consider disabled items

2015-05-22 21:14:11 +01:00

HeaderField.php

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

2015-06-17 11:24:25 +12:00

HiddenField.php

DOCS Fixing docs (and bad API usage)

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

HtmlEditorConfig.php

API Support for multiple HTMLEditorConfig per page

2015-06-09 12:17:55 +12:00

HtmlEditorField.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

HtmlEditorSanitiser.php

Rewrote usages of error suppression operator

2014-03-05 15:48:55 +13:00

InlineFormAction.php

DOCS Fixing docs (and bad API usage)

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

LabelField.php

Clean up LabelField

2015-04-30 16:21:33 +12:00

ListboxField.php

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

2015-06-02 19:13:38 +12:00

LiteralField.php

Clean up LiteralField

2015-04-30 11:53:02 +12:00

LookupField.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

MemberDatetimeOptionsetField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

MoneyField.php

DOCS Fixing docs (and bad API usage)

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

NestedForm.php

Remove all redundant whitespace

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

NullableField.php

DOCS Fixing docs (and bad API usage)

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

NumericField.php

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

2015-06-19 10:48:07 +12:00

OptionsetField.php

FEATURE: add validation to form field subclasses

2014-11-17 08:17:38 +13:00

PasswordField.php

Clean up PasswordField

2015-04-30 11:20:46 +12:00

PhoneNumberField.php

DOCS Fixing docs (and bad API usage)

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

PrintableTransformation.php

Remove all redundant whitespace

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

ReadonlyField.php

DOCS Fixing docs (and bad API usage)

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

ReadonlyTransformation.php

Remove all redundant whitespace

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

RequiredFields.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

ResetFormAction.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

SelectionGroup.php

Remove all redundant whitespace

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

Tab.php

Remove all redundant whitespace

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

TabSet.php

Remove all redundant whitespace

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

TabularStyle.php

Remove all redundant whitespace

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

TextareaField.php

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

2015-06-17 11:24:25 +12:00

TextField.php

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

2015-06-02 19:13:38 +12:00

TimeField.php

FIX: remove validation type constraint from form fields for 3.2 release

2015-05-11 12:32:00 +12:00

ToggleCompositeField.php

Clean Up ToggleCompositeField

2015-04-30 11:52:21 +12:00

TreeDropdownField.php

DOCS Fixing docs (and bad API usage)

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

TreeMultiselectField.php

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

2015-02-20 10:17:19 +13:00

UploadField.php

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

2015-06-17 11:24:25 +12:00

Validator.php

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

2015-06-02 19:13:38 +12:00