Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php

2014-08-14 09:08:26 +12:00

..

gridfield

Merge remote-tracking branch 'origin/3.1'

2014-08-14 09:08:26 +12:00

CheckboxField.php

Merge remote-tracking branch 'origin/3.0' into 3.1.0

2013-08-22 12:55:47 +02:00

CheckboxSetField.php

Moved checkboxset option list generation to separate method

2014-07-25 11:27:14 +12:00

CompositeField.php

FieldList->insertBefore/After now accept arguments in either order (fixes #2737)

2014-03-15 11:32:51 +00:00

ConfirmedPasswordField.php

Merge remote-tracking branch 'origin/3.1'

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

CountryDropdownField.php

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

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

CreditCardField.php

API: Change CreditCardField to use AttributeHTML

2013-10-03 15:26:31 +01:00

CurrencyField.php

API Copying instance props on FormField readonly/disabled transformations

2012-12-14 01:58:04 +01:00

DatalessField.php

Method visibility according to coding conventions

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

DateField.php

API Removed auto-detection for i18n date/time formats

2014-02-16 23:57:49 +13:00

DatetimeField.php

Fixes issue #2669

2013-11-15 14:18:48 -05:00

DisabledTransformation.php

Method visibility according to coding conventions

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

DropdownField.php

Merge remote-tracking branch 'origin/3.1'

2014-06-15 22:50:20 +12:00

EmailField.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

FieldGroup.php

Updated fieldgroup class and example code

2013-07-26 16:01:24 +02:00

FieldList.php

FieldList->insertBefore/After now accept arguments in either order (fixes #2737)

2014-03-15 11:32:51 +00:00

FileField.php

Move validator shortcut methods from UploadField to FileField

2014-07-17 21:40:30 +01:00

Form.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

FormAction.php

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

2013-02-26 13:28:35 +01:00

FormField.php

Merge remote-tracking branch 'origin/3.1'

2014-06-17 18:17:24 +12:00

FormScaffolder.php

API Polymorphic has_one behaviour

2014-03-18 09:18:04 +13:00

FormTemplateHelper.php

FIX: Generate Form::FormName() through

2013-05-30 21:06:41 +12:00

FormTransformation.php

Method visibility according to coding conventions

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

GroupedDropdownField.php

NEW Disable items in DropdownField and GroupedDropdownField

2013-01-11 16:32:20 +01:00

HeaderField.php

make setHeadingLevel a chainable method

2013-11-02 01:21:56 +01:00

HiddenField.php

Fixed HiddenField->SmallFieldHolder() declaration

2013-04-05 14:03:13 +02:00

HtmlEditorConfig.php

API Let update interval of tinymce be changed or disabled

2014-07-28 13:54:02 +12:00

HtmlEditorField.php

Merge remote-tracking branch 'origin/3.1'

2014-08-14 09:08:26 +12:00

HtmlEditorSanitiser.php

Rewrote usages of error suppression operator

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

InlineFormAction.php

API Copying instance props on FormField readonly/disabled transformations

2012-12-14 01:58:04 +01:00

LabelField.php

Method visibility according to coding conventions

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

ListboxField.php

Correct line length and indentation

2013-08-21 18:54:05 +12:00

LiteralField.php

Method visibility according to coding conventions

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

LookupField.php

API: LookupField::Field now returns an HTMLText instance.

2013-10-18 10:28:17 +13:00

MemberDatetimeOptionsetField.php

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

2013-02-18 14:31:57 +13:00

MoneyField.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

NestedForm.php

Method visibility according to coding conventions

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

NullableField.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

NumericField.php

API Use "number" HTML5 type for NumericField by default

2014-08-04 14:27:35 +12:00

OptionsetField.php

BUG: #2503 Fixes performReadonlyTransformation for OptionSetField

2014-01-30 16:09:55 +13:00

PasswordField.php

Add autocomplete=off switch for the password field.

2013-06-12 09:41:18 +12:00

PhoneNumberField.php

BUG Fixed incorrect variable usage in generation of PhoneNumberField form fields

2013-04-12 15:13:58 +12:00

PrintableTransformation.php

Method visibility according to coding conventions

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

ReadonlyField.php

NEW: Add ReadonlyField::setIncludeHiddenField()

2013-01-08 17:45:17 +13:00

ReadonlyTransformation.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

RequiredFields.php

FIX: Use Injector API for managing Member_Validator instance.

2013-10-16 11:29:43 +13:00

ResetFormAction.php

Method visibility according to coding conventions

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

SelectionGroup.php

Consistent API for SelectionGroup constructor.

2013-12-21 14:55:53 +13:00

Tab.php

ENHANCEMENT addExtraClass() support for Tab and TabSet

2012-05-08 11:25:44 +02:00

TabSet.php

FieldList->insertBefore/After now accept arguments in either order (fixes #2737)

2014-03-15 11:32:51 +00:00

TabularStyle.php

Method visibility according to coding conventions

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

TextareaField.php

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

2013-01-21 11:14:57 +01:00

TextField.php

Method visibility according to coding conventions

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

TimeField.php

API Removed auto-detection for i18n date/time formats

2014-02-16 23:57:49 +13:00

ToggleCompositeField.php

Removed deprecated ToggleCompositeField::startClosed()

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

ToggleField.php

BUG Fixing ToggleField to work correctly with jQuery

2012-11-16 11:33:58 +13:00

TreeDropdownField.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

TreeMultiselectField.php

Query param support in TreeMultiselectField (fixes #2438)

2013-10-02 15:42:29 +02:00

UploadField.php

Move validator shortcut methods from UploadField to FileField

2014-07-17 21:40:30 +01:00

Validator.php

Removing deprecated Validator javascript methods

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