silverstripe-framework/tests
Sam Minnee d97ca43cd0 Merge branch '3.1'
Conflicts:
	README.md
	dev/install/install.php5
	forms/ConfirmedPasswordField.php
	tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
..
api API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
behat Added iShouldSeeAButton assertion 2013-04-09 09:39:06 +02:00
cache Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
control Merge branch '3.1' 2013-05-23 19:01:58 +12:00
core Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-17 13:50:40 +02:00
dev FIX: If CSV column mapping maps to function, keep key value as key. 2013-05-14 22:00:52 +12:00
filesystem API: Add sync_blacklisted_patterns for configuring files to skip in sync tasks 2013-05-11 16:06:14 +12:00
forms Merge branch '3.1' 2013-05-23 19:01:58 +12:00
i18n FIX Handle PHP 5.4's short array notation everywhere arrays are parsed. 2013-05-05 13:27:42 +12:00
injector Remove duplicate parse_class_spec method. 2013-05-05 11:43:56 +12:00
integration FIX We still need XML escaping on href attributes in HTML4Value 2013-04-18 09:13:24 +12:00
javascript Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
model Merge branch '3.1' 2013-05-23 19:01:58 +12:00
oembed FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
parsers FIX Unquoted shortcodes weren't parsed (fixes #680) 2013-04-26 01:00:13 +02:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
security API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
tasks Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
templates MINOR: updated and extended Tests 2013-04-22 18:17:31 +00:00
testing API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
view MINOR: updated and extended Tests 2013-04-22 18:17:31 +00: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 Setting SapphireTest::is_running_test() in PHPUnit bootstrap 2013-01-09 23:31:10 +01:00
FakeController.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
MemoryLimitTest.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
phpcs_runner.php Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
PhpSyntaxTest.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00