Damian Mooyman d52db0ba34 Merge 3 into master ...

# Conflicts:
#	.travis.yml
#	admin/css/ie7.css
#	admin/css/ie7.css.map
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.js
#	admin/scss/_style.scss
#	admin/scss/_uitheme.scss
#	control/HTTPRequest.php
#	core/Object.php
#	css/AssetUploadField.css
#	css/AssetUploadField.css.map
#	css/ConfirmedPasswordField.css.map
#	css/Form.css.map
#	css/GridField.css.map
#	css/TreeDropdownField.css.map
#	css/UploadField.css
#	css/UploadField.css.map
#	css/debug.css.map
#	dev/Debug.php
#	docs/en/00_Getting_Started/00_Server_Requirements.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
#	filesystem/File.php
#	filesystem/Folder.php
#	filesystem/GD.php
#	filesystem/Upload.php
#	forms/ToggleField.php
#	forms/Validator.php
#	javascript/lang/en_GB.js
#	javascript/lang/fr.js
#	javascript/lang/src/en.js
#	javascript/lang/src/fr.js
#	model/Image.php
#	model/UnsavedRelationList.php
#	model/Versioned.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/DBField.php
#	model/fieldtypes/Enum.php
#	scss/AssetUploadField.scss
#	scss/UploadField.scss
#	templates/email/ChangePasswordEmail.ss
#	templates/forms/DropdownField.ss
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
#	tests/forms/EnumFieldTest.php
#	tests/security/MemberTest.php
#	tests/security/MemberTest.yml
#	tests/security/SecurityTest.php

2016-04-29 17:50:55 +12:00

..

testimages

API Refactor of File / Folder to use DBFile

2015-10-13 11:57:39 +13:00

ArrayListTest.php

Merge 3 into master

2016-04-29 17:50:55 +12:00

ChangeSetItemTest.php

Add two new accessors to ChangeSetItem

2016-04-15 14:42:24 +12:00

ChangeSetTest.php

Fix ChangeSet test mixing Object ID and ChangeSetItem ID up

2016-04-15 14:42:32 +12:00

ChangeSetTest.yml

API Use base data class for ChangeSetItem#ObjectClass, not just ClassName

2016-04-15 14:41:26 +12:00

ComponentSetTest.php

Remove all redundant whitespace

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

ComponentSetTest.yml

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

DatabaseTest.php

API Add SS_Database::withTransaction for nice enclosed transactions

2016-03-24 09:57:07 +13:00

DataDifferencerTest.php

API Update Versioned methods

2016-04-04 14:50:16 +12:00

DataDifferencerTest.yml

API Refactor of File / Folder to use DBFile

2015-10-13 11:57:39 +13:00

DataExtensionTest.php

Merge 3 into master

2016-04-29 17:50:55 +12:00

DataExtensionTest.yml

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

DataListTest.php

Merge 3 into master

2016-04-29 17:50:55 +12:00

DataObjectDuplicationTest.php

Remove all redundant whitespace

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

DataObjectLazyLoadingTest.php

API Update Versioned methods

2016-04-04 14:50:16 +12:00

DataObjectSchemaGenerationTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DataObjectTest_Namespaced.php

Remove all redundant whitespace

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

DataObjectTest.php

API Formally support custom ownership relations

2016-03-23 14:49:34 +13:00

DataObjectTest.yml

API Enable DataList::sort to support composite field names (similar to filter)

2015-12-01 09:35:33 +13:00

DataQueryTest.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

DataQueryTest.yml

BUG Fix data query not always joining necessary tables

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

DBClassNameTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBCompositeTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBCurrencyTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBDateTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DbDatetimeTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DbDatetimeTest.yml

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

DBFieldTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBHTMLTextTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBLocaleTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBMoneyTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBPercentageTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBStringTest.php

MINOR: Fix PHPUnit @covers assertions for DBStringTest

2016-03-26 17:58:28 +13:00

DBTest.php

Remove all redundant whitespace

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

DBTextTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DBYearTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

DecimalTest.php

Remove all redundant whitespace

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

DecimalTest.yml

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

GDImageTest.php

Removed obsolete TestRunner->$skipTests flag

2016-02-23 22:29:58 +13:00

GroupedListTest.php

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

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

HasManyListTest.php

API remove Object::useCustomClass

2016-02-17 10:22:04 +13:00

HierarchyTest.php

API Update Versioned methods

2016-04-04 14:50:16 +12:00

HierarchyTest.yml

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ImageTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

ImageTest.yml

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ImagickImageTest.php

Cleanup trailing whitespace

2016-03-09 10:20:31 +13:00

LabelFieldTest.php

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13: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

API: Move DBField subclasses into SilverStripe\Model\FieldType namespace

2016-03-22 18:09:30 +13:00

MapTest.php

API remove Object::useCustomClass

2016-02-17 10:22:04 +13:00

MoneyTest.yml

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

MySQLDatabaseTest.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

MySQLDatabaseTest.yml

API Use mysql buffered statements

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

PaginatedListTest.php

API remove Object::useCustomClass

2016-02-17 10:22:04 +13:00

PDODatabaseTest.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

PolymorphicHasManyListTest.php

API remove Object::useCustomClass

2016-02-17 10:22:04 +13:00

SQLInsertTest.php

Remove all redundant whitespace

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

SQLSelectTest.php

Cleanup trailing whitespace

2016-03-09 10:20:31 +13:00

SQLSelectTest.yml

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13: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

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

Cleanup trailing whitespace

2016-03-09 10:20:31 +13:00

ValidationExceptionTest.php

Remove all redundant whitespace

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

VersionableExtensionsFixtures.yml

Enhancement and fix for issue #3186

2016-02-23 14:53:52 -06:00

VersionableExtensionsTest.php

Enhancement and fix for issue #3186

2016-02-23 14:53:52 -06:00

VersionedOwnershipTest.php

API Update Versioned methods

2016-04-04 14:50:16 +12:00

VersionedOwnershipTest.yml

API Formally support custom ownership relations

2016-03-23 14:49:34 +13:00

VersionedTest.php

Merge 3 into master

2016-04-29 17:50:55 +12:00

VersionedTest.yml

Merge 3.3 into 3

2016-04-26 00:24:59 +01:00