Damian Mooyman 9da594b326 Merge 3.1 into 3.2 ...

# Conflicts:
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	javascript/lang/ar.js
#	javascript/lang/bg.js
#	javascript/lang/cs.js
#	javascript/lang/de.js
#	javascript/lang/eo.js
#	javascript/lang/es.js
#	javascript/lang/fa_IR.js
#	javascript/lang/fi.js
#	javascript/lang/fr.js
#	javascript/lang/id.js
#	javascript/lang/id_ID.js
#	javascript/lang/it.js
#	javascript/lang/ja.js
#	javascript/lang/lt.js
#	javascript/lang/mi.js
#	javascript/lang/nb.js
#	javascript/lang/nl.js
#	javascript/lang/pl.js
#	javascript/lang/ru.js
#	javascript/lang/sk.js
#	javascript/lang/sl.js
#	javascript/lang/sr.js
#	javascript/lang/sr@latin.js
#	javascript/lang/sr_RS.js
#	javascript/lang/sr_RS@latin.js
#	javascript/lang/sv.js
#	javascript/lang/zh.js
#	lang/nl.yml
#	lang/sk.yml

2016-05-11 13:48:22 +12:00

..

testimages

FIX Image test cleanup

2015-06-12 16:43:13 -07:00

AggregateTest.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

AggregateTest.yml

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

ArrayListTest.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:35:29 +12:00

ComponentSetTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

ComponentSetTest.yml

MINOR Added ComponentSetTest

2010-02-22 04:37:32 +00:00

CompositeDBFieldTest.php

Cleaning up Test DataObjects to ensure TestOnly is implemented

2015-02-12 15:22:29 +00:00

CurrencyTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DatabaseTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DataDifferencerTest.php

FIX Image test cleanup

2015-06-12 16:43:13 -07:00

DataDifferencerTest.yml

API-CHANGE sapphire folder can now be renamed.

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

DataExtensionTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DataExtensionTest.yml

API CHANGE: Renamed DataObjectDecorator to DataExtension.

2011-04-26 11:01:38 +10:00

DataListTest.php

BUG Correct behaviour for empty filter array (as per 3.1)

2015-11-10 14:24:45 +13:00

DataObjectDuplicationTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DataObjectLazyLoadingTest.php

BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects

2016-01-22 15:35:58 +13:00

DataObjectSchemaGenerationTest.php

BUG Prevent dev/build continually regenerating Number field type

2015-11-11 09:21:50 +13:00

DataObjectTest_Namespaced.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DataObjectTest.php

Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly

2015-11-06 16:23:45 +00:00

DataObjectTest.yml

Fixes, tests and documentation for multiple many_manys between the same class

2015-03-13 09:27:23 +00:00

DataQueryTest.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

DataQueryTest.yml

BUG Fix data query not always joining necessary tables

2014-05-06 12:22:46 +12:00

DateTest.php

API DateTime.Ago better infers significance of date units.

2014-08-25 10:04:24 +12:00

DatetimeTest.php

API DateTime.Ago better infers significance of date units.

2014-08-25 10:04:24 +12:00

DbDatetimeTest.php

Moved deprecation of SQLQuery to 4.0

2014-12-04 09:30:50 +13:00

DbDatetimeTest.yml

MINOR Removed dependency on SiteTree in various unit tests

2011-03-29 18:07:58 +13:00

DBFieldTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DBLocaleTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DBTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DecimalTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

DecimalTest.yml

API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure

2011-03-31 09:56:21 +13:00

GDImageTest.php

API New and renamed image functions

2015-06-12 17:02:55 -07:00

GroupedListTest.php

Corrected TotalItems() method to use Count(). Added test coverage. (fixes #4646)

2015-11-04 00:20:45 +13:00

HasManyListTest.php

Cleaning up Test DataObjects to ensure TestOnly is implemented

2015-02-12 15:22:29 +00:00

HierarchyTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

HierarchyTest.yml

NEW Enforce max node counts to avoid excessive resource usage

2013-04-09 10:24:18 +12:00

HTMLTextTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

ImageTest.php

BUG Imagick tests compare image dimensions rather than image hashes

2015-10-06 16:35:44 +13:00

ImageTest.yml

FIX Image test cleanup

2015-06-12 16:43:13 -07:00

ImagickImageTest.php

FIX Image test cleanup

2015-06-12 16:43:13 -07:00

LabelFieldTest.php

Method visibility according to coding conventions

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

ManyManyListExtensionTest.php

BUG edge case on many many extra fields (fixes 4991)

2016-02-04 12:47:07 +13:00

ManyManyListExtensionTest.yml

BUG edge case on many many extra fields (fixes 4991)

2016-02-04 12:47:07 +13:00

ManyManyListTest.php

Merge 3.1 into 3.2

2016-05-11 13:48:22 +12:00

MapTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

MoneyTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

MoneyTest.yml

Added test for lazy-loading edge-case in Money field.

2013-04-22 11:50:57 +12:00

MySQLDatabaseTest.php

Nest and unnest Config and Controller for each test and test suite

2015-06-11 16:37:25 +01:00

MySQLDatabaseTest.yml

API Use mysql buffered statements

2015-05-08 13:23:53 +12:00

PaginatedListTest.php

API enable PaginatedList to be disabled by setting page length to 0

2015-03-05 12:07:14 +13:00

PDODatabaseTest.php

BUG Fix major segfault on PDOConnector after any DDL

2015-06-17 13:34:21 +12:00

PercentageTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PolymorphicHasManyListTest.php

Cleaning up Test DataObjects to ensure TestOnly is implemented

2015-02-12 15:22:29 +00:00

SQLInsertTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

SQLQueryTest.php

Make SQLQuery strict semver for 3.2

2015-06-17 16:54:17 +12:00

SQLQueryTest.yml

BUG SQLQuery::aggregate() with limit, groupBy and orderBy (fixes #8148)

2012-12-21 15:20:59 +01:00

SQLUpdateTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

SQLUpdateTest.yml

API New Database abstraction layer. Ticket #7429

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

StringFieldTest.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-07-31 11:38:18 +12:00

TextTest.php

NEW Text - Limit characters to closest word

2015-03-05 23:12:02 +00:00

TransactionTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

UnsavedRelationListTest.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

UnsavedRelationListTest.yml

NEW: Allows setting of has_many and many_many relations before writing

2012-11-28 09:37:08 +13:00

URLSegmentFilterTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

ValidationExceptionTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

VersionedTest.php

BUG Correct behaviour of publish with $createNewVersion = true

2016-02-23 10:15:49 +13:00

VersionedTest.yml

BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects

2016-01-22 15:35:58 +13:00

YearTest.php

FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.

2013-12-16 03:29:29 +00:00