silverstripe-framework/control
Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +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 Remove all redundant whitespace 2014-08-19 09:17:15 +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 Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
Director.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
FlushRequestFilter.php Correct regression around ?flush 2014-10-30 20:51:05 +11:00
HTTP.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
HTTPRequest.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
HTTPResponse.php Remove all redundant whitespace 2014-08-19 09:17:15 +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 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