Simon Welsh c14d58f585 Merge branch '3.1' ...

Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php

2014-07-16 21:24:02 +10:00

..

BacktraceTest.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

CsvBulkLoaderTest_Players.csv

Merged from branches/2.3

2009-02-03 04:00:02 +00:00

CsvBulkLoaderTest_PlayersWithCustomHeaderAndRelation.csv

API CHANGE: Created CSVParser class and updated CSVBulkLoader to use it

2008-10-03 00:27:58 +00:00

CsvBulkLoaderTest_PlayersWithHeader.csv

Merged from branches/2.3

2009-02-03 04:00:02 +00:00

CsvBulkLoaderTest_PlayersWithId.csv

FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.

2013-04-19 16:52:39 +12:00

CsvBulkLoaderTest_PlayersWithIdUpdated.csv

API CHANGE: Created CSVParser class and updated CSVBulkLoader to use it

2008-10-03 00:27:58 +00:00

CsvBulkLoaderTest.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

CsvBulkLoaderTest.yml

API CHANGE: Created CSVParser class and updated CSVBulkLoader to use it

2008-10-03 00:27:58 +00:00

CSVParserTest.php

FIX: If CSV column mapping maps to function, keep key value as key.

2013-05-14 22:00:52 +12:00

DeprecationTest.php

Fixed PHPUnit assertions for incomplete tests in core

2012-11-23 15:16:39 +01:00

FixtureBlueprintTest.php

Add support for many_many_extraField in YAML

2014-02-24 22:03:53 +13:00

FixtureFactoryTest.php

Add support for many_many_extraField in YAML

2014-02-24 22:03:53 +13:00

LogTest.php

Adding some more commonly used SS_Log priority constants.

2014-06-23 11:50:05 +12:00

MySQLDatabaseConfigurationHelperTest.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00