Simon Welsh 2566795b59 Merge branch '3.1' ...

Conflicts:
	view/SSViewer.php

2014-03-30 19:39:18 +13:00

..

install

Merge remote-tracking branch 'origin/3.1'

2014-03-16 09:36:48 +13:00

phpunit

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01: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

Method visibility according to coding conventions

2012-09-20 10:46:59 +02: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

BUG: Fixed out of date RFC 4180 URL

2014-02-05 14:44:56 +13:00

CSVParser.php

Code formatting / PHPDoc cleanup

2013-05-14 22:06:02 +12:00

Debug.php

Make default PHP error handler fatal

2014-03-15 11:52:01 +00:00

DebugView.php

Merge remote-tracking branch 'origin/3.1'

2014-03-16 09:36:48 +13:00

Deprecation.php

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-11-05 10:15:40 +01:00

DevelopmentAdmin.php

BUG fix missing permission for dev/build/defaults

2013-11-08 11:09:46 +13:00

FixtureBlueprint.php

API Polymorphic has_one behaviour

2014-03-18 09:18:04 +13:00

FixtureFactory.php

NEW FixtureFactory separated out from YamlFixture

2012-12-11 17:06:27 +01:00

FunctionalTest.php

Fix $disable_themes test state

2014-02-07 16:38:41 +13: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

Rewrote usages of error suppression operator

2014-03-05 15:48:55 +13:00

LogEmailWriter.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

LogErrorEmailFormatter.php

Rewrote usages of error suppression operator

2014-03-05 15:48:55 +13: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 branch '3.1'

2014-03-10 22:58:49 +13: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 19:37:54 +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 19:37:54 +13:00

TestListener.php

Correct line length and indentation

2014-03-30 19:37:54 +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 Polymorphic has_one behaviour

2014-03-18 09:18:04 +13:00

TestSession.php

MINOR: Minor fixes to FunctionalTest

2013-01-29 18:03:48 +01: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