silverstripe-framework/dev
Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
..
install Fixing function that should be declared as static. 2014-07-11 15:23:44 +12:00
phpunit BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:22:04 +12:00
Backtrace.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-11-05 10:15:40 +01:00
BehatFixtureFactory.php Correct line length and indentation 2013-08-21 21:27:16 +12:00
BuildTask.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
BulkLoader.php BUG: Fixed out of date RFC 4180 URL 2014-02-05 14:44:56 +13:00
Cli.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CliDebugView.php API Debug::dump in CLI no longer generates HTML. Uses colours. 2014-07-05 14:37:06 +12:00
CliTestReporter.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CSSContentParser.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CsvBulkLoader.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
CSVParser.php Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
Debug.php Merge branch '3.1' 2014-07-16 21:24:02 +10:00
DebugView.php Merge branch '3.1' 2014-07-16 21:24:02 +10:00
Deprecation.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-11-05 10:15:40 +01:00
DevelopmentAdmin.php Path resolution cleanup 2014-05-05 14:52:41 +12:00
FixtureBlueprint.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
FixtureFactory.php BUG Revert some changes to ManyManyList 2014-07-23 12:38:41 +12:00
FunctionalTest.php PHPDoc cleanup 2014-07-29 12:43:43 +12:00
InstallerTest.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
JSTestRunner.php NEW: Correcting the JSRunnerTest template comments 2014-02-07 10:40:28 +13:00
Log.php Adding some more commonly used SS_Log priority constants. 2014-06-23 11:50:05 +12:00
LogEmailWriter.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
LogErrorEmailFormatter.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
LogErrorFileFormatter.php Adding defaults for unhandled event priorities in log formatters. 2014-02-24 15:41:03 +13:00
LogFileWriter.php Merge branch '3.0' 2012-09-21 14:56:56 +12:00
MigrationTask.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
Profiler.php Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-12 10:11:56 +01:00
SapphireInfo.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
SapphireREPL.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
SapphireTest.php Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
SapphireTestReporter.php Correct line length and indentation 2014-03-30 19:37:54 +13:00
SapphireTestSuite.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
SilverStripeListener.php Correct line length and indentation 2014-03-30 21:11:56 +13:00
SysLogWriter.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
TaskRunner.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
TeamCityListener.php Correct line length and indentation 2014-03-30 21:11:56 +13:00
TestListener.php Correct line length and indentation 2014-03-30 21:11:56 +13:00
TestMailer.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
TestOnly.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
TestRunner.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
TestSession.php PHPDoc cleanup 2014-07-29 12:43:43 +12:00
YamlFixture.php NEW FixtureFactory separated out from YamlFixture 2012-12-11 17:06:27 +01:00
ZendLog.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00