silverstripe-framework/control
Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3'
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
..
injector remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
ContentNegotiator.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
Controller.php Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
Cookie_Backend.php remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
Cookie.php Revert #3425 #3396 to restore deprecated functionality 2015-08-24 11:26:25 +12:00
CookieJar.php Add missing packages 2015-08-24 16:15:38 +12:00
Director.php Merge pull request #4656 from spekulatius/fixing-phpdoc-blocks 2015-10-07 16:00:24 +13:00
FlushRequestFilter.php remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
HTTP.php Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
HTTPRequest.php fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-10-06 18:28:04 +13:00
HTTPResponse.php API Generated files API 2015-10-23 10:07:48 +13:00
NullHTTPRequest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PjaxResponseNegotiator.php Merge pull request #4656 from spekulatius/fixing-phpdoc-blocks 2015-10-07 16:00:24 +13:00
RequestFilter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RequestHandler.php Merge pull request #4656 from spekulatius/fixing-phpdoc-blocks 2015-10-07 16:00:24 +13:00
RequestProcessor.php NEW Provide a consistent way of triggering flush 2014-08-22 09:24:27 +12:00
Session.php adding a space before casting into a different type 2015-09-28 22:21:02 +13:00
VersionedRequestFilter.php BUG Fix Versioned stage not persisting in Session. Fixes #962 2014-05-06 14:11:44 +12:00