Damian Mooyman 309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 ...

Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php

2015-09-09 14:35:29 +12:00

..

injector

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-07-31 11:38:18 +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

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

Cookie_Backend.php

Add missing packages

2015-08-24 16:15:38 +12: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

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

FlushRequestFilter.php

Correct regression around ?flush

2014-10-30 20:51:05 +11:00

HTTP.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:35:29 +12:00

HTTPRequest.php

Merge remote-tracking branch 'origin/3.1' into 3

2015-06-02 19:13:38 +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

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

VersionedRequestFilter.php

BUG Fix Versioned stage not persisting in Session. Fixes #962

2014-05-06 14:11:44 +12:00