silverstripe-framework/tests
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
..
api MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
assets FIX extra_requirements to accept non associative arrays. 2013-06-02 13:37:34 +12:00
behat MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
cache Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
control Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
core Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
dev Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
email Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
filesystem Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
forms Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
i18n MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
injector Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
integration Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
javascript MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
model Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
oembed Nest and unnest Config and Controller for each test and test suite 2015-06-11 16:37:25 +01:00
parsers MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
security Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
tasks Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
templates MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
testing MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
view Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
Bare.yml MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests. 2011-02-02 14:17:57 +13:00
bootstrap.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
FakeController.php FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
MemoryLimitTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
phpcs_runner.php Only have Scrutinizer check PHP files 2013-08-21 21:02:12 +12:00
PhpSyntaxTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00