Simon Welsh d431e98ecf Merge branch '3.1' ...

Conflicts:
	forms/Form.php
	forms/FormField.php
	security/Member.php
	security/MemberLoginForm.php

2014-03-10 22:58:49 +13:00

..

fieldtypes

Merge remote-tracking branch 'origin/3.1'

2014-02-18 22:06:59 +13:00

Aggregate.php

Deprecate Aggregate and DataObject::getComponentsQuery

2013-07-08 15:27:13 +12:00

ArrayList.php

NEW: Add support for push operator on ArrayList (Fixes #1539)

2014-01-12 18:55:40 +13:00

Database.php

Rewrote usages of error suppression operator

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

DatabaseAdmin.php

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

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

DataDifferencer.php

Method visibility according to coding conventions

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

DataExtension.php

Revert "FIX make augmentSQL API consistent for strict PHP"

2013-06-01 11:51:01 +12:00

DataList.php

added filterByCallback() to interface SS_Filterable and all implementing classes

2013-11-21 13:03:18 +00:00

DataModel.php

Update @package, @subpackage labels

2013-05-21 22:24:41 +12:00

DataObject.php

Merge remote-tracking branch 'origin/3.1'

2014-02-18 22:06:59 +13:00

DataObjectInterface.php

Removing deprecated instance_get_one() and instance_get()

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

DataQuery.php

BUG Sort column order maintained correctly when using expressions in SQLQuery and DataQuery

2013-10-03 14:20:31 +13:00

DB.php

Fixed whitespace usage

2013-02-18 15:43:52 +01:00

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

GroupedList.php

GroupedList: Enable grouping by a function result.

2013-12-21 15:15:55 +13:00

HasManyList.php

BUG Fixes issue where items could be deleted from a has_many relation by an entirely unrelated HasManyList calling delete on that item.

2013-11-01 11:39:13 +13:00

HiddenClass.php

MINOR Update @package values to match renaming sapphire

2012-04-15 10:50:19 +12:00

Hierarchy.php

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

2013-08-22 13:00:25 +02:00

HTMLValue.php

Rewrote usages of error suppression operator

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

Image_Backend.php

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

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

Image.php

image cacheFilename checks for numeric strings

2013-10-23 10:16:18 +03:00

Limitable.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

List.php

NEW: Add new method "each" to SS_List and core implementors thereof

2012-11-02 18:21:02 -07:00

ListDecorator.php

added filterByCallback() to interface SS_Filterable and all implementing classes

2013-11-21 13:03:18 +00:00

ManyManyList.php

Update @package, @subpackage labels

2013-05-21 22:24:41 +12:00

Map.php

API: Implement SS_Map::push() to append values.

2013-11-18 20:38:57 +13:00

MySQLDatabase.php

Separate out SS_Query and MySQLQuery from their Database classes

2013-11-28 11:55:25 +13:00

MySQLQuery.php

Separate out SS_Query and MySQLQuery from their Database classes

2013-11-28 11:55:25 +13:00

Query.php

Fixing SQLQueryTest failures on PHPUnit 3.7.30

2014-02-10 13:32:39 +13:00

RelationList.php

Update @package, @subpackage labels

2013-05-21 22:24:41 +12:00

Sortable.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

SQLMap.php

Scoped deprecation messages (fixes #7645)

2012-07-13 11:37:35 +02:00

SQLQuery.php

Update SQLQuery.php

2013-12-18 10:00:31 +11:00

Transliterator.php

cs_CZ transliteration chars (fixes #2816)

2014-02-07 17:43:41 +13:00

UnsavedRelationList.php

Merge pull request #1992 from jthomerson/fix_unsaved_relation_list_constructor

2013-05-24 15:19:19 -07:00

URLSegmentFilter.php

Remove trailing dashes from URLSegment

2014-03-03 22:22:03 +00:00

ValidationException.php

BUG Enforced requirement that ValidationException::getResult() is expected to consistently produce a valid ValidationResult object.

2013-03-15 13:56:43 +13:00

ValidationResult.php

NEW: Made ValidationResult functions chain-able.

2014-01-09 16:32:27 +13:00

Versioned.php

Merge remote-tracking branch 'origin/3.1'

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