Ingo Schommer 8c5e56fe31 Merge branch 'master' into integration ...

Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html

2012-04-09 21:10:08 +02:00

..

install

Merge branch 'master' into integration

2012-04-09 21:10:08 +02:00

phpunit

MINOR: Amended PHPUnit execution to work with PHPUnit 3.6

2011-11-08 11:26:40 +13:00

Backtrace.php

MINOR Rewrite stack trace from "In line <line> of <file>" to a more readable and common "<file>:<line>"

2012-02-06 23:38:32 +01:00

BuildTask.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

BulkLoader.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

Cli.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

CliDebugView.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

CliTestReporter.php

MINOR Removed "In line of " text in CLI test reporter which did not work. Details are in the backtrace below anyway, so it's not required

2011-02-02 14:19:57 +13:00

CodeViewer.php

API CHANGE: Replaced ManifestBuilder::load_test_manifest() calls with new function TestRunner::use_test_manifest(), which pushes a test manifest onto the class loader.

2011-03-24 20:14:43 +11:00

CSSContentParser.php

BUGFIX Force tidy to avoid wrapping long lines in CSSContentParser, it breaks our FunctionalTest string assertions

2011-02-02 14:19:53 +13:00

CsvBulkLoader.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

CSVParser.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

Debug.php

MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3

2012-03-27 23:16:52 +13:00

DebugView.php

Merge branch 'master' into integration

2012-04-09 21:10:08 +02:00

Deprecation.php

BUGFIX: Deprecation notices should fire in test mode too, just not in live mode

2011-10-31 13:51:31 +13:00

DevelopmentAdmin.php

MINOR Using late static binding instead of Object::create() calls

2012-04-04 17:10:31 +02:00

FunctionalTest.php

MINOR altered skipTest to be a instance property rather than static

2011-09-26 17:11:49 +13:00

InstallerTest.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

JSTestRunner.php

ENHANCEMENT: Added allowed actions to core classes

2011-02-14 11:14:51 +13:00

Log.php

ENHANCEMENT Allow logging of extra data in SS_Log::log() (currently only displayed through SS_LogEmailWriter)

2012-02-06 23:38:37 +01:00

LogEmailWriter.php

ENHANCEMENT Allow logging of extra data in SS_Log::log() (currently only displayed through SS_LogEmailWriter)

2012-02-06 23:38:37 +01:00

LogErrorEmailFormatter.php

ENHANCEMENT Allow logging of extra data in SS_Log::log() (currently only displayed through SS_LogEmailWriter)

2012-02-06 23:38:37 +01:00

LogErrorFileFormatter.php

Currently, the time format does not allow differentiate the AM/PM hours since the format choosen is 12h and no AM/PM label is added to each log line. So, my suggestion is to convert to 24h format (using a H instead of h) to fix this issue.

2011-12-29 16:17:14 +00:00

LogFileWriter.php

MINOR Fixed SS_LogEmailWriter and SS_LogFileWriter to adhere to new Zend interface

2011-05-30 21:30:32 +12:00

MigrationTask.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

ModelViewer.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

Profiler.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

SapphireInfo.php

MINOR: Fix to SapphireInfo for git-svn checkouts.

2011-02-02 14:19:58 +13:00

SapphireREPL.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

SapphireTest.php

BUGFIX: Use UTC consistently across all tests for date/time calculations

2012-03-27 10:29:07 -07:00

SapphireTestReporter.php

Replace ereg with preg_*

2012-02-27 22:14:02 +01:00

SapphireTestSuite.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

SysLogWriter.php

MINOR Declaring SS_SysLogWriter::factory() to comply with changed parent interface

2011-08-12 17:05:54 +02:00

TaskRunner.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

TestListener.php

ENHANCEMENT Added custom test listener for PHPUnit in order to call setUpOnce() and tearDownOnce() on SapphireTest

2011-02-02 14:19:52 +13:00

TestMailer.php

BUGFIX Return values in TestMailer for send() commands same as Mailer class

2009-06-26 04:28:47 +00:00

TestOnly.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

TestRunner.php

BUGFIX: Fixed dev/tests/startsession form action

2012-03-05 14:36:38 +13:00

TestSession.php

BUGFIX: TestSession::submitForm throws proper error if form not found

2011-02-02 14:19:25 +13:00

TestViewer.php

BUGFIX Fixed usage of htmlentities() and html_entity_decode() to be UTF8 compatible by default

2011-03-21 18:13:01 +13:00

YamlFixture.php

Unicode actually fixed...

2012-01-10 16:15:03 +13:00

ZendLog.php

MINOR Fixed phpdoc documentation

2011-02-02 14:19:15 +13:00