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

# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss

2016-02-25 14:51:59 +13:00

..

install

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +13:00

Backtrace.php

API Refactor of File / Folder to use DBFile

2015-10-13 11:57:39 +13: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

NEW: Replace DebugView’s writeX() functions with renderX() functions.

2015-08-28 16:06:37 +12:00

CliTestReporter.php

API Removed custom dev/tests/ execution

2016-02-23 20:19:35 +13: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

API CHANGE: Shift to Monolog for error reporting and logging

2015-08-28 16:06:41 +12:00

DebugView.php

API CHANGE: Shift to Monolog for error reporting and logging

2015-08-28 16:06:41 +12:00

Deprecation.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

DevBuildController.php

Fixed permission checks for /dev/build action

2016-01-13 14:05:14 +01:00

DevelopmentAdmin.php

[ss-2015-028] Block unauthenticated access to dev/build/defaults

2016-02-24 11:32:49 +13:00

FixtureBlueprint.php

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

FixtureFactory.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

FunctionalTest.php

Removed obsolete TestRunner->$skipTests flag

2016-02-23 22:29:58 +13:00

InstallerTest.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

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

Removed obsolete TestRunner->$skipTests flag

2016-02-23 22:29:58 +13:00

SapphireTestReporter.php

Update PHPUnit from 3.7 to 4.8

2016-02-24 21:42:20 +13:00

SilverStripeListener.php

Support PHPUnit 3.8+ compatibility

2014-08-22 13:43:23 +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

TestSession.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

YamlFixture.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00