Ingo Schommer f03ad7b0dd Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	admin/javascript/LeftAndMain.AddForm.js
	control/Director.php
	control/HTTPResponse.php
	dev/Profiler.php
	email/Mailer.php
	forms/ComplexTableField.php
	forms/ManyManyComplexTableField.php
	forms/SimpleImageField.php
	forms/TableField.php
	forms/TableListField.php
	javascript/ComplexTableField.js
	javascript/ImageFormAction.js
	javascript/TableField.js
	javascript/TableListField.js
	security/Member.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/forms/TableListFieldTest.php

2012-12-12 10:11:56 +01:00

..

install

ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.

2012-10-05 17:00:39 +13:00

phpunit

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

Backtrace.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +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 17:33:31 +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

FIX Remove instances of lines longer than 120c

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

CSVParser.php

Method visibility according to coding conventions

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

Debug.php

Removing deprecated prototype/behaviour libraries

2012-11-16 11:37:56 +13: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

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

FixtureBlueprint.php

NEW FixtureFactory separated out from YamlFixture

2012-12-11 17:06:27 +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 17:33:31 +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

FIX Remove instances of lines longer than 120c

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

LogErrorFileFormatter.php

MINOR Update @package values to match renaming sapphire

2012-04-15 10:50:19 +12: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

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

Merge remote-tracking branch 'origin/3.0'

2012-12-11 17:16:19 +01:00

SapphireTestReporter.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +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 17:33:31 +13:00

SysLogWriter.php

MINOR Update @package values to match renaming sapphire

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

TaskRunner.php

Merge remote-tracking branch 'origin/3.0'

2012-10-03 16:16:19 +02:00

TeamCityListener.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

TestListener.php

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +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

Merge remote-tracking branch 'origin/3.0'

2012-12-11 17:16:19 +01:00

TestSession.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13: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