silverstripe-framework/tests
Damian Mooyman 58cb0af753 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.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/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
2015-01-16 10:08:40 +13:00
..
api Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
assets FIX extra_requirements to accept non associative arrays. 2013-06-02 13:37:34 +12:00
behat Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
cache Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
control Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
core Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
dev Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
email API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding 2014-09-25 16:04:56 +12:00
filesystem Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
forms Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
i18n Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
injector Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
integration Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
javascript Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
model Merge remote-tracking branch 'origin/3' 2015-01-16 10:08:40 +13:00
oembed Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
parsers Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
security Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
tasks Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
templates FEATURE: <% include %> inherits iterator scope of parent template 2013-07-07 12:39:42 +00:00
testing Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
view Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +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 Remove all redundant whitespace 2014-08-19 09:17:15 +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