Damian Mooyman f4b13fb2c4

Merge remote-tracking branch 'origin/3.6' into 3 ...

# Conflicts:
#	model/DataQuery.php

2018-02-05 16:53:15 +13:00

..

connect

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

fieldtypes

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

queries

Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns

2017-03-03 14:11:53 +13:00

Aggregate.php

MINOR: stop Aggregate clear cache on DataObject::write()

2017-01-27 07:51:42 +13:00

ArrayList.php

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

DatabaseAdmin.php

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

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

DataDifferencer.php

FIX DataDifferencer needs to expliclty cast HTMLText values

2017-05-29 00:10:32 +01:00

DataExtension.php

Revert #3425 #3396 to restore deprecated functionality

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

DataList.php

FIX filterAny error message now refers to correct method name

2016-10-30 12:04:07 +00:00

DataModel.php

Remove all redundant whitespace

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

DataObject.php

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

2018-02-05 16:53:15 +13:00

DataObjectInterface.php

Remove all redundant whitespace

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

DataQuery.php

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

2018-02-05 16:53:15 +13:00

DB.php

showqueries debugging tool now inserts parameters in place (#5885)

2016-09-15 09:15:19 +12: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

FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023)

2017-06-15 12:06:30 +01:00

HiddenClass.php

Remove all redundant whitespace

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

Hierarchy.php

Merge branch '3.6' into 3

2017-08-14 13:43:28 +01: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

NEW Add (alt text) to title field for clarity

2017-09-29 09:33:55 +13: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

feat(ListDecorator): Add setList() function. Useful for keeping a decorator/paginated list configuration intact while modifying the underlying list.

2017-01-13 15:03:47 +11:00

ManyManyList.php

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

Map.php

Merge branch '3.1' into 3.2

2016-10-27 16:14:01 +01:00

PolymorphicHasManyList.php

Remove all redundant whitespace

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

RelationList.php

Cleanup of RelationList, HasManyList and ManyManyList

2016-08-19 10:37:58 +01: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

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

UnsavedRelationList.php

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

URLSegmentFilter.php

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

ValidationException.php

Remove all redundant whitespace

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

ValidationResult.php

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

Versioned.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2017-12-06 17:21:09 +13:00