Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ...

# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss

2016-02-25 14:51:59 +13:00

..

connect

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

fieldtypes

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

queries

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

versioning

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

ArrayList.php

Merge remote-tracking branch 'origin/3'

2016-02-12 15:41:45 +13: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'

2016-01-20 13:16:27 +13:00

DataExtension.php

API File has Versioned extension

2016-02-23 13:46:28 +13:00

DataList.php

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

DataModel.php

Remove all redundant whitespace

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

DataObject.php

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

DataObjectInterface.php

Remove all redundant whitespace

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

DataQuery.php

API Enable linear-only restriction for DataList::applyRelation

2015-12-01 09:58:27 +13: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

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

Image_Backend.php

API Asset Access Control implementation

2016-01-13 18:18:22 +13:00

Image.php

Image deprecations and optimisation

2016-02-16 09:40:18 -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

API Standardise SS_List::map() implementation

2016-01-25 10:22:47 +13:00

ListDecorator.php

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

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

ManyManyList.php

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

Map.php

API Standardise SS_List::map() implementation

2016-01-25 10:22:47 +13:00

PolymorphicHasManyList.php

Remove all redundant whitespace

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

Relation.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13:00

RelationList.php

API Cleanup and refactor of select fields

2016-01-21 15:40:19 +13: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'

2016-02-25 14:51:59 +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

API Asset Access Control implementation

2016-01-13 18:18:22 +13:00