silverstripe-framework/control
Damian Mooyman d52db0ba34 Merge 3 into master
# Conflicts:
#	.travis.yml
#	admin/css/ie7.css
#	admin/css/ie7.css.map
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.js
#	admin/scss/_style.scss
#	admin/scss/_uitheme.scss
#	control/HTTPRequest.php
#	core/Object.php
#	css/AssetUploadField.css
#	css/AssetUploadField.css.map
#	css/ConfirmedPasswordField.css.map
#	css/Form.css.map
#	css/GridField.css.map
#	css/TreeDropdownField.css.map
#	css/UploadField.css
#	css/UploadField.css.map
#	css/debug.css.map
#	dev/Debug.php
#	docs/en/00_Getting_Started/00_Server_Requirements.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
#	filesystem/File.php
#	filesystem/Folder.php
#	filesystem/GD.php
#	filesystem/Upload.php
#	forms/ToggleField.php
#	forms/Validator.php
#	javascript/lang/en_GB.js
#	javascript/lang/fr.js
#	javascript/lang/src/en.js
#	javascript/lang/src/fr.js
#	model/Image.php
#	model/UnsavedRelationList.php
#	model/Versioned.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/DBField.php
#	model/fieldtypes/Enum.php
#	scss/AssetUploadField.scss
#	scss/UploadField.scss
#	templates/email/ChangePasswordEmail.ss
#	templates/forms/DropdownField.ss
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
#	tests/forms/EnumFieldTest.php
#	tests/security/MemberTest.php
#	tests/security/MemberTest.yml
#	tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
..
injector Merge 3 into master 2016-04-29 17:50:55 +12:00
ContentNegotiator.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Controller.php BUG Remove duplicate extension hook 2016-03-21 14:03:41 +13:00
Cookie_Backend.php Merge remote-tracking branch 'origin/3' 2015-09-09 15:44:47 +12:00
Cookie.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
CookieJar.php API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
Director.php FIX for #5279 Addressing only a few PSR-2 items in one file, but primarily targeting Director::is_https() and invalid URL's. 2016-04-06 18:26:47 -07:00
FlushRequestFilter.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
HTTP.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
HTTPRequest.php Merge 3 into master 2016-04-29 17:50:55 +12:00
HTTPResponse.php Extra semi-colon and double quotes 2016-03-07 17:59:18 +11:00
NullHTTPRequest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PjaxResponseNegotiator.php Merge pull request #4656 from spekulatius/fixing-phpdoc-blocks 2015-10-07 16:00:24 +13:00
RequestFilter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RequestHandler.php BUG Remove duplicate extension hook 2016-03-21 14:03:41 +13:00
RequestProcessor.php NEW Provide a consistent way of triggering flush 2014-08-22 09:24:27 +12:00
Session.php adding a space before casting into a different type 2015-09-28 22:21:02 +13:00
VersionedRequestFilter.php BUG Workaround for issues in testing version 2015-12-22 17:47:53 +13:00