Damian Mooyman 8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php

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

..

gridfield

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

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

images

This is a fixed version for RegenerateCachedImagesTask (former FlushGeneratedImagesTask) such that it regenerates images instead of silently removing them and breaking existing pages

2013-04-06 15:56:27 +02:00

uploadfield

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

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

CheckboxFieldTest.php

FEATURE: add validation to form field subclasses

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

CheckboxSetFieldTest.php

FEATURE: add validation to form field subclasses

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

CheckboxSetFieldTest.yml

FEATURE: add validation to form field subclasses

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

CompositeFieldTest.php

FEATURE: add validation to form field subclasses

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

ConfirmedPasswordFieldTest.php

FEATURE: add validation to form field subclasses

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

CurrencyFieldTest.php

FEATURE: add validation to form field subclasses

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

DateFieldTest.php

Remove all redundant whitespace

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

DatefieldViewJQueryTest.php

Remove all redundant whitespace

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

DatetimeFieldTest.php

Remove all redundant whitespace

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

DropdownFieldTest.php

FIX: DropdownField didn't consider disabled items

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

EmailFieldTest.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12:00

EnumFieldTest.php

Remove all redundant whitespace

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

FieldListTest.php

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

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

FileFieldTest.php

Remove all redundant whitespace

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

FormActionTest.php

Remove all redundant whitespace

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

FormFieldTest.php

NEW: updateAttributes hook in FormField

2015-02-08 19:14:31 +13:00

FormScaffolderTest.php

Remove all redundant whitespace

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

FormScaffolderTest.yml

FEATURE Added ForeignKey and used it in relation- and databasefield getters in DataObject

2008-10-13 22:20:41 +00:00

FormTest.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12:00

FormTest.yml

BUGFIX Adjusted FormTest->testLoadDataFromObject() to new assumptions about changed behaviour on loadDataFrom() from $loadBlanks to $clearMissingFields - which means that form fields are cleared regardless if they have blank values in the passed object or not

2008-10-09 14:40:13 +00:00

GridFieldTest.php

Remove all redundant whitespace

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

GroupedDropdownFieldTest.php

FIX: DropdownField didn't consider disabled items

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

HtmlEditorConfigTest.php

Remove all redundant whitespace

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

HtmlEditorFieldTest.php

Remove all redundant whitespace

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

HtmlEditorFieldTest.yml

This is a fixed version for RegenerateCachedImagesTask (former FlushGeneratedImagesTask) such that it regenerates images instead of silently removing them and breaking existing pages

2013-04-06 15:56:27 +02:00

HtmlEditorSanitiserTest.php

Remove all redundant whitespace

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

ListboxFieldTest.php

FEATURE: add validation to form field subclasses

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

ListboxFieldTest.yml

ENHANCEMENT Relationship saving in ListboxField (preparing for chosen.js usage), escaping commas in payload when serialising multiple values into a single field

2012-03-05 10:55:09 +01:00

LookupFieldTest.php

Remove all redundant whitespace

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

LookupFieldTest.yml

BUGFIX Added support for array values in LookupField, to ensure it works correctly when used as a readonly representation of ListboxField (AIR-39)

2011-10-07 14:12:49 +02:00

MemberDatetimeOptionsetFieldTest.php

FEATURE: add validation to form field subclasses

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

MemberDatetimeOptionsetFieldTest.yml

ENHANCEMENT #5352 Decouple date display from i18n locales, users now have access to change their date and time formats in Member::getCMSFields() using Member_DatetimeOptionsetField field (from r107326)

2010-10-15 03:23:02 +00:00

MoneyFieldTest.php

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

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

NullableFieldTests.php

Remove all redundant whitespace

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

NumericFieldTest.php

Fix merge errors and regressions

2015-02-20 11:49:47 +13:00

OptionsetFieldTest.php

Remove all redundant whitespace

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

RequiredFieldsTest.php

removeRequiredField() limits field (fixes #2165)

2013-09-27 19:58:59 +02:00

RequirementsTest_a.css

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_a.js

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_b.css

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_b.js

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_c.css

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_c.js

ENHANCEMENT Using namespaces for filenames in RequirementsTest

2008-11-01 14:04:31 +00:00

RequirementsTest_print_a.css

API Add possibility to combine media-targeting stylesheets.

2013-02-13 11:04:05 +13:00

RequirementsTest_print_b.css

API Add possibility to combine media-targeting stylesheets.

2013-02-13 11:04:05 +13:00

RequirementsTest.php

Merge remote-tracking branch 'origin/3.1'

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

SelectionGroupTest.php

Remove all redundant whitespace

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

TextareaFieldTest.php

Remove all redundant whitespace

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

TextFieldTest.php

Implement validate() method for TextField to validate max length (closes #4073)

2015-05-19 09:36:51 +01:00

TimeFieldTest.php

Remove all redundant whitespace

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

TreeDropdownFieldTest.php

BUGFIX Fixes case insensitive search for postgres databases

2015-03-02 09:55:29 +13:00

TreeDropdownFieldTest.yml

BUGFIX Use correct query when searching for items managed by a tree dropdown field #3173

2015-02-27 11:18:27 +13:00