silverstripe-framework/dev
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
..
install Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
phpunit Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
Backtrace.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BehatFixtureFactory.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BuildTask.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Cli.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CliDebugView.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CliTestReporter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CSSContentParser.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
CsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CSVParser.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Debug.php BUG Debug error handler breaks error_get_last 2015-02-08 17:02:22 +13:00
DebugView.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Deprecation.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DevBuildController.php ENH making /dev extendable 2014-08-06 16:29:52 +12:00
DevelopmentAdmin.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
FixtureBlueprint.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
FixtureFactory.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
FunctionalTest.php BUG Fixing Director::test() failing on BASE_URL prefixed URLs 2014-08-22 15:21:53 +12:00
InstallerTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
JSTestRunner.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Log.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogEmailWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogErrorEmailFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogErrorFileFormatter.php Adding defaults for unhandled event priorities in log formatters. 2014-02-24 15:41:03 +13:00
LogFileWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MigrationTask.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireInfo.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireREPL.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireTest.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
SapphireTestReporter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireTestSuite.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SilverStripeListener.php Support PHPUnit 3.8+ compatibility 2014-08-22 13:43:23 +12:00
SysLogWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
TaskRunner.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
TeamCityListener.php Support PHPUnit 3.8+ compatibility 2014-08-22 13:43:23 +12:00
TestListener.php Merge remote-tracking branch 'origin/3.0' into 3.1 2014-08-22 17:50:36 +12:00
TestMailer.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
TestOnly.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
TestRunner.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
TestSession.php Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
YamlFixture.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
ZendLog.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00