Damian Mooyman f13e44a265 Merge 3 into master ... # Conflicts: # admin/javascript/LeftAndMain.Tree.js # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/en.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # css/GridField.css # forms/gridfield/GridFieldExportButton.php # javascript/GridField.js # javascript/lang/ar.js # javascript/lang/cs.js # javascript/lang/de.js # javascript/lang/en.js # javascript/lang/en_GB.js # javascript/lang/eo.js # javascript/lang/es.js # javascript/lang/fi.js # javascript/lang/fr.js # javascript/lang/id.js # javascript/lang/id_ID.js # javascript/lang/it.js # javascript/lang/ja.js # javascript/lang/lt.js # javascript/lang/mi.js # javascript/lang/nb.js # javascript/lang/nl.js # javascript/lang/pl.js # javascript/lang/ru.js # javascript/lang/sk.js # javascript/lang/sl.js # javascript/lang/sr.js # javascript/lang/sr@latin.js # javascript/lang/sr_RS.js # javascript/lang/sr_RS@latin.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # javascript/lang/sv.js # javascript/lang/zh.js # scss/GridField.scss # tests/model/ManyManyListTest.php # tests/model/SQLQueryTest.php		2016-05-11 15:19:35 +12:00
..
connect	Merge 3 into master	2016-04-29 17:50:55 +12:00
FieldType	FIX: Renaming to HTMLEditorConfig.	2016-05-06 14:16:34 +12:00
queries	Merge 3 into master	2016-05-11 15:19:35 +12:00
versioning	API Campaign preview for images	2016-05-02 15:27:12 +12:00
ArrayList.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
DatabaseAdmin.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-09-15 13:18:47 +12:00
DataDifferencer.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
DataExtension.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
DataList.php	API Filtering on invalid relation is no longer a silent error	2016-05-03 17:51:16 +12:00
DataModel.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
DataObject.php	API Add i18n pluralisation	2016-04-14 12:01:42 +12:00
DataObjectInterface.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
DataQuery.php	API Filtering on invalid relation is no longer a silent error	2016-05-03 17:51:16 +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	API Update TinyMCE to 4.x	2016-02-23 10:10:02 +13:00
Image_Backend.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
Image.php	API Campaign preview for images	2016-05-02 15:27:12 +12: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	Merge pull request #3828 from dhensby/pulls/byids-arraylist	2016-04-26 17:52:22 +12:00
ManyManyList.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +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 Massive refactor of Versioned	2016-03-17 13:43:53 +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 branch '3'	2016-05-04 23:36:10 +01: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