Daniel Hensby 679185514d

Merge 3.3 into 3 ...

Conflicts:
	admin/css/screen.css.map

2016-04-26 00:24:59 +01:00

..

connect

Merge 3.3 into 3

2016-04-26 00:24:59 +01:00

fieldtypes

FIX #5363 Add .JSON option for templates

2016-04-21 17:01:05 +12:00

queries

Merge 3.3 into 3

2016-04-26 00:24:59 +01:00

Aggregate.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ArrayList.php

Update ArrayList.php

2016-02-11 08:19:29 +13:00

DatabaseAdmin.php

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

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

DataDifferencer.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

DataExtension.php

Revert #3425 #3396 to restore deprecated functionality

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

DataList.php

DOCS: DataList::filter() broken examples

2016-03-24 21:32:49 +00:00

DataModel.php

Remove all redundant whitespace

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

DataObject.php

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

2016-02-24 17:39:04 +13: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

Replaced filterByCallback for 'Children' to just create a new array as function calls are exponentially expensive in PHP (the more functions that exist, the slower a function call becomes) and replaced 'array_key_exists' with op-code equivalent for speed. The best increase isn't really noticeable but we should work towards optimizing the core as much as possible.

2016-01-25 13:22:51 +00: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

Merge 3.3 into 3

2016-04-26 00:24:59 +01: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

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13: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

FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList()

2016-01-25 11:09:37 +13:00

URLSegmentFilter.php

Remove question marks, equal signs and hashes

2016-01-22 15:40:11 +00: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 3.3 into 3

2016-04-26 00:24:59 +01:00