silverstripe-framework/control
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
..
injector Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
ContentNegotiator.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Controller.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Cookie_Backend.php remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
Cookie.php Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
CookieJar.php Add missing packages 2015-08-24 16:15:38 +12:00
Director.php API Enable advanced configuration options for requirements combined files 2015-12-01 11:07:13 +13: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 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-10-06 18:28:04 +13:00
HTTPResponse.php BUG Fix incorrect error page handling 2015-12-15 14:49:13 +13: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 Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +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