silverstripe-framework/control
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
..
injector Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
ContentNegotiator.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Controller.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Cookie_Backend.php remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
Cookie.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
CookieJar.php Add missing packages 2015-08-24 16:15:38 +12:00
Director.php Merge remote-tracking branch 'origin/3' 2016-02-25 14:51:59 +13:00
FlushRequestFilter.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
HTTP.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
HTTPRequest.php Merge remote-tracking branch 'origin/3' 2016-02-25 14:51:59 +13:00
HTTPResponse.php Replaced obsolete mime types 2016-01-24 18:15:47 +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 API File has Versioned extension 2016-02-23 13:46:28 +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 Workaround for issues in testing version 2015-12-22 17:47:53 +13:00