Damian Mooyman 48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 ...

# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php

2015-12-22 14:07:52 +13:00

..

connect

BUG Prevent dev/build continually regenerating Number field type

2015-11-11 09:21:50 +13:00

fieldtypes

Allow multi-line enum declarations

2015-10-15 16:23:19 +01:00

queries

Add missing packages

2015-08-24 16:15:38 +12:00

Aggregate.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

ArrayList.php

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

2015-09-09 14:35:29 +12:00

DatabaseAdmin.php

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

2015-09-15 13:18:47 +12:00

DataDifferencer.php

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

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

DataExtension.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

DataList.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

DataModel.php

Remove all redundant whitespace

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

DataObject.php

Merge pull request #4751 from dhensby/pulls/plural-fix

2015-11-06 16:55:25 +00:00

DataObjectInterface.php

Remove all redundant whitespace

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

DataQuery.php

FIX: Fixed regression from ClassInfo case-sensitivity fix.

2015-08-07 14:20:01 +12:00

DB.php

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

Filterable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

GroupedList.php

Remove all redundant whitespace

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

HasManyList.php

Remove all redundant whitespace

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

HiddenClass.php

Remove all redundant whitespace

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

Hierarchy.php

BUG Fix missing framework/admin/tests

2015-09-10 11:06:15 +12:00

HTMLValue.php

Rewrote usages of error suppression operator

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

Image_Backend.php

BUG fix imagick interface and add to travis

2015-10-06 12:40:24 +13:00

Image.php

FIX Image_Cached record class name

2015-11-24 10:49:31 -08:00

Limitable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

List.php

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

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

ListDecorator.php

Corrected TotalItems() method to use Count(). Added test coverage. (fixes #4646)

2015-11-04 00:20:45 +13:00

ManyManyList.php

BUG Fix false values for many_many_ExtraFields not being saved

2015-06-09 12:05:25 +12:00

Map.php

Remove all redundant whitespace

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

PolymorphicHasManyList.php

Remove all redundant whitespace

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

RelationList.php

Remove all redundant whitespace

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

Sortable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

Transliterator.php

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

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

UnsavedRelationList.php

Merge remote-tracking branch 'origin/3.1'

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

URLSegmentFilter.php

Remove forward slash in URLs in multibyte mode

2015-08-26 17:40:04 +12:00

ValidationException.php

Remove all redundant whitespace

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

ValidationResult.php

Remove all redundant whitespace

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

Versioned.php

Merge pull request #4830 from open-sausages/pulls/3/fix-querystring-stage

2015-12-10 10:44:43 +13:00