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

# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss

2016-02-25 14:51:59 +13:00

..

gridfield

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

htmleditor

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

AssetField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

CheckboxField.php

Remove all redundant whitespace

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

CheckboxSetField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

CompositeField.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ConfirmedPasswordField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

CountryDropdownField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13: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

ENHANCEMENT CurrencyField to use Currency.currency_symbol

2015-11-09 19:38:51 -06:00

DatalessField.php

DOCS Fixing docs (and bad API usage)

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

DateField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13: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

API Add isDisabledValue to SelectField

2016-01-21 15:40:19 +13: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

FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)

2015-11-17 16:34:17 +00:00

FieldList.php

API File has Versioned extension

2016-02-23 13:46:28 +13:00

FileField.php

API Refactor of File / Folder to use DBFile

2015-10-13 11:57:39 +13:00

Form.php

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

FormAction.php

DOCS Fixing docs (and bad API usage)

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

FormField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

FormScaffolder.php

API Consolidate DataObject db methods

2015-09-22 10:38:12 +12: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

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13: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

HtmlEditorSanitiser.php

Rewrote usages of error suppression operator

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

InlineFormAction.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

LabelField.php

Clean up LabelField

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

ListboxField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

LiteralField.php

Clean up LiteralField

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

LookupField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

MemberDatetimeOptionsetField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

MoneyField.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

MultiSelectField.php

API Add isDisabledValue to SelectField

2016-01-21 15:40:19 +13: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

BUG Remove html5 number field due to insufficient localisation support

2015-09-01 12:23:35 +12:00

OptionsetField.php

API Add isDisabledValue to SelectField

2016-01-21 15:40:19 +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

SelectField.php

API Add isDisabledValue to SelectField

2016-01-21 15:40:19 +13:00

SelectionGroup.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

SingleSelectField.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

Tab.php

Remove all redundant whitespace

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

TabSet.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

TabularStyle.php

Remove all redundant whitespace

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

TextareaField.php

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13: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

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

TreeDropdownField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

TreeMultiselectField.php

Implement RFC-7 JavaScript module loader

2016-01-26 11:39:20 +13:00

UploadField.php

API File has Versioned extension

2016-02-23 13:46:28 +13:00

Validator.php

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

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