Damian Mooyman d52db0ba34 Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.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/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php		2016-04-29 17:50:55 +12:00
..
manifest	BUG Prevent live manifest loading files from nested test directories	2016-03-31 15:58:23 +13:00
startup	Merge 3 into master	2016-04-29 17:50:55 +12: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	FIX: Don’t use SplFixedArray in PHP 7.	2016-03-22 18:09:38 +13:00
Configurable.php	API remove Object::useCustomClass	2016-02-17 10:22:04 +13:00
Constants.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +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	Merge 3 into master	2016-04-29 17:50:55 +12:00
DAG.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Diff.php	FIX: Removed PHP4 syntax from Diff.php	2016-03-22 17:39:08 +13:00
Extensible.php	API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-25 17:32:41 +13:00
Extension.php	API Formally support custom ownership relations	2016-03-23 14:49:34 +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 Implement campaign list view	2016-04-14 12:02:59 +12:00
Object.php	Merge 3 into master	2016-04-29 17:50:55 +12: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