Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php

2015-03-31 19:54:15 +13:00

..

injector

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

ContentNegotiator.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Controller.php

Update Controller to allow extension in handleAction()

2015-02-08 19:43:44 +13: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

Suggested improvements / test case fixes

2014-10-10 09:28:11 +13:00

Director.php

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

2015-03-31 19:54:15 +13: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

2015-03-31 19:54:15 +13:00

HTTPRequest.php

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

2015-02-20 10:17:19 +13:00

HTTPResponse.php

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

2015-02-20 10:17:19 +13: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

Remove all redundant whitespace

2014-08-19 09:17:15 +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.1'

2014-11-18 12:45:54 +13:00

VersionedRequestFilter.php

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

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