Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php

2014-08-14 09:08:26 +12:00

..

injector

Merge remote-tracking branch 'origin/3.1'

2014-08-14 09:08:26 +12:00

ContentNegotiator.php

BUGFIX: added <param> tag to ContentNegotiator filtering

2013-09-19 17:30:36 +02:00

Controller.php

Merge branch '3.1'

2014-07-16 21:24:02 +10:00

Cookie.php

Ensure Cookie::get() will immediately return results.

2013-06-07 11:27:15 +12:00

Director.php

Revert #3345 #3323

2014-07-31 17:05:57 +12:00

HTTP.php

API Fix HTTPS proxy header detection

2014-05-22 18:34:15 +12:00

HTTPRequest.php

Merge remote-tracking branch 'origin/3.1'

2014-03-16 09:36:48 +13:00

HTTPResponse.php

API HTTP 429 Allowed for use with rate limiting methods

2014-04-17 16:35:09 +12:00

NullHTTPRequest.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

PjaxResponseNegotiator.php

Update @package, @subpackage labels

2013-05-21 22:24:41 +12:00

RequestFilter.php

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

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

RequestHandler.php

API Enforce $allowed_actions in RequestHandler->checkAccessAction()

2013-06-24 14:50:40 +02:00

RequestProcessor.php

BUG Revert some changes to ManyManyList

2014-07-23 12:38:41 +12:00

Session.php

Merge branch '3.1'

2014-07-16 21:24:02 +10:00

VersionedRequestFilter.php

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

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