Damian Mooyman 786b1dd5d4 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	control/HTTPRequest.php
	filesystem/Upload.php
	model/ManyManyList.php

2015-06-09 11:10:14 +12: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

Replace core uses of DataObject::has_one/has_many/many_many

2015-03-13 16:16:12 +00: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

Replace core uses of DataObject::has_one/has_many/many_many

2015-03-13 16:16:12 +00:00

CSVParser.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Debug.php

FIX Debug::text no longer incorrecty returns "ViewableData_debugger"

2015-04-01 22:13:05 +01: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

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12:00

FixtureBlueprint.php

Fix merge regressions / errors

2015-06-02 20:19:12 +12:00

FixtureFactory.php

Removing @deprecated 3.1 functionality and classes.

2014-08-18 16:00:13 +12:00

FunctionalTest.php

Update FunctionalTest.php API notes

2015-03-04 18:38:43 +13: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

FIX check for suite existence in endCurrentTest

2014-12-04 14:59:52 +00: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

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12: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