silverstripe-framework/control
Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
2015-07-31 15:49:35 +12:00
..
injector Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12: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.1' into 3 2015-06-02 19:13:38 +12:00
Cookie_Backend.php Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
Cookie.php Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
CookieJar.php NEW Cookie names with dots are now handled more gracefully 2015-05-12 10:49:58 +01:00
Director.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
FlushRequestFilter.php Correct regression around ?flush 2014-10-30 20:51:05 +11:00
HTTP.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
HTTPRequest.php minor codestyle stuff 2015-07-27 19:17:37 +12:00
HTTPResponse.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
NullHTTPRequest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PjaxResponseNegotiator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RequestFilter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RequestHandler.php UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
RequestProcessor.php NEW Provide a consistent way of triggering flush 2014-08-22 09:24:27 +12:00
Session.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
VersionedRequestFilter.php BUG Fix Versioned stage not persisting in Session. Fixes #962 2014-05-06 14:11:44 +12:00