Damian Mooyman c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 ...

Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php

2015-11-03 13:06:39 +13:00

..

install

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

2015-09-15 13:18:47 +12:00

phpunit

Add missing packages

2015-08-24 16:15:38 +12: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

Splitting BulkLoader imports to reduce memory consumption

2015-09-15 10:06:06 +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

Merge remote-tracking branch 'origin/3.2' into 3

2015-11-03 13:06:39 +13:00

CSVParser.php

Remove all redundant whitespace

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

Debug.php

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

DebugView.php

Remove all redundant whitespace

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

Deprecation.php

API Disable deprecation notices by default

2015-07-16 09:56:47 +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

BUG Fix regression from #4396 in test fixtures

2015-10-29 17:36:38 +13: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

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +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

Unable to migrate down

2015-06-20 00:38:59 +12:00

Profiler.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +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

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

2015-09-09 14:35:29 +12:00

SapphireTestReporter.php

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

2014-08-22 17:50:36 +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

Allow abstract BuildTask subclasses (closes #4538)

2015-08-25 10:14:15 +01:00

TeamCityListener.php

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

2015-09-09 14:35:29 +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' into 3.2

2015-09-09 14:35:29 +12:00

TestSession.php

Suggested improvements / test case fixes

2014-10-10 09:28:11 +13:00

YamlFixture.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

ZendLog.php

Remove all redundant whitespace

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