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
..
manifest	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
startup	Merge remote-tracking branch 'origin/3.3' into 3	2016-02-24 17:39:04 +13:00
ArrayLib.php	Do not hang on nested parameters in search context	2015-09-23 09:12:02 +02:00
ClassInfo.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
Config.php	Remove unused local vars	2015-08-03 20:42:43 +02:00
Configurable.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
Constants.php	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
Convert.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
Core.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
CustomMethods.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
DAG.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Diff.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Extensible.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
Extension.php	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
Flushable.php	NEW Provide a consistent way of triggering flush	2014-08-22 09:24:27 +12:00
HTMLCleaner.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Injectable.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
Object.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
PaginatedList.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:16 +13:00
TempPath.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00