Ingo Schommer 99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 ...

Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php

2013-03-19 13:56:04 +01:00

..

install

BUG Secure composer files from web access (fixes #8011)

2013-02-17 22:33:04 +01:00

phpunit

FIX PHPUnit latest not working with composer installed builds

2013-01-23 14:30:08 +13:00

Backtrace.php

Minor PHP5.4 fixes

2012-10-16 23:37:30 +13:00

BuildTask.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

BulkLoader.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +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

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

2013-03-19 13:56:04 +01:00

CSVParser.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

Debug.php

Fixed whitespace usage

2013-02-18 15:43:52 +01:00

DebugView.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

Deprecation.php

BUG Fixed issue with Deprecation failing to extract the module from a stacktrace, especially on non-unix systems

2012-10-17 11:57:16 +13:00

DevelopmentAdmin.php

Fixed spacing

2012-12-14 00:09:30 +01:00

FixtureBlueprint.php

Don't complain about pre-replaced YAML fixture relations

2012-12-20 12:46:56 +01:00

FixtureFactory.php

NEW FixtureFactory separated out from YamlFixture

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

FunctionalTest.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +13:00

InstallerTest.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

JSTestRunner.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

Log.php

ENHANCEMENT Make it possible to extend SS_Log

2012-10-04 16:34:20 +10:00

LogEmailWriter.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

LogErrorEmailFormatter.php

BUG Exception handling and email notification mechanism now correctly considers the stacktrace as provided by the exceptionHandler function, instead of attempting to perform a debug_backtrace further down the reporting chain (which ends up generating an unnecessarily nested stacktrace). Debug was cleaned up so that errorHandler and exceptionHandler both act consistently. As a result, the LogErrorEmailFormatter class could be simplified.

2013-01-24 09:36:42 +01:00

LogErrorFileFormatter.php

BUGFIX Ensure has length before using string index access.

2012-12-20 12:27:09 +10:00

LogFileWriter.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

MigrationTask.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

Profiler.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +13:00

SapphireInfo.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

SapphireREPL.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

SapphireTest.php

FIX: Set up the test mailer before loading the fixture, in case fixture-creation causes emails to be generated.

2013-01-29 18:03:45 +01:00

SapphireTestReporter.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +13:00

SapphireTestSuite.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

SilverStripeListener.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +13:00

SysLogWriter.php

MINOR Update @package values to match renaming sapphire

2012-04-15 10:50:19 +12:00

TaskRunner.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

TeamCityListener.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +13:00

TestListener.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 00:12:11 +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 Storing alternative DB name in cookie rather than session

2012-12-13 23:21:48 +01: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