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

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

2015-03-31 19:54:15 +13: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

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

CompositeField.php

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

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

ConfirmedPasswordField.php

FEATURE: add validation to form field subclasses

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

CountryDropdownField.php

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

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

CreditCardField.php

BUG notice level error when value is not set on CreditCardField

2015-01-31 11:15:52 +13:00

CurrencyField.php

FEATURE: add validation to form field subclasses

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

DatalessField.php

Remove all redundant whitespace

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

DateField.php

FEATURE: add validation to form field subclasses

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

DatetimeField.php

FEATURE: add validation to form field subclasses

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

DisabledTransformation.php

Method visibility according to coding conventions

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

DropdownField.php

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

2015-01-15 18:52:46 +13:00

EmailField.php

FEATURE: add validation to form field subclasses

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

FieldGroup.php

Remove all redundant whitespace

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

FieldList.php

Remove all redundant whitespace

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

FileField.php

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

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

Form.php

API Adding default_classes to Form

2015-01-20 13:36:31 +00:00

FormAction.php

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

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

FormField.php

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

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

Remove GroupedDropdownField::validate() (regression)

2015-02-21 16:15:03 +13:00

HeaderField.php

Remove all redundant whitespace

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

HiddenField.php

FEATURE: add validation to form field subclasses

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

HtmlEditorConfig.php

Merge remote-tracking branch 'origin/3.1'

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

HtmlEditorField.php

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

2015-01-15 18:52:46 +13:00

HtmlEditorSanitiser.php

Rewrote usages of error suppression operator

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

InlineFormAction.php

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

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

LabelField.php

Remove all redundant whitespace

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

ListboxField.php

FEATURE: add validation to form field subclasses

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

LiteralField.php

Remove all redundant whitespace

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

LookupField.php

Merge remote-tracking branch 'origin/3.1'

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

MemberDatetimeOptionsetField.php

FEATURE: add validation to form field subclasses

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

MoneyField.php

FEATURE: add validation to form field subclasses

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

NestedForm.php

Remove all redundant whitespace

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

NullableField.php

FEATURE: add validation to form field subclasses

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

NumericField.php

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

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

OptionsetField.php

FEATURE: add validation to form field subclasses

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

PasswordField.php

Removing deprecated class/functions marked for deprecation in 3.0/3.1

2014-08-25 12:06:05 +12:00

PhoneNumberField.php

FEATURE: add validation to form field subclasses

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

PrintableTransformation.php

Remove all redundant whitespace

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

ReadonlyField.php

FEATURE: add validation to form field subclasses

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

ReadonlyTransformation.php

Remove all redundant whitespace

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

RequiredFields.php

Remove all redundant whitespace

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

Remove all redundant whitespace

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

TextField.php

Remove all redundant whitespace

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

TimeField.php

FEATURE: add validation to form field subclasses

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

ToggleCompositeField.php

Removed deprecated ToggleCompositeField::startClosed()

2012-11-15 14:43:21 +13:00

TreeDropdownField.php

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

2015-03-11 11:40:06 +13:00

TreeMultiselectField.php

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

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

UploadField.php

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

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

Validator.php

FEATURE: add validation to form field subclasses

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