Damian Mooyman 309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 ...

Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php

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

..

connect

Typo

2015-09-02 15:51:04 +02:00

fieldtypes

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

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

queries

Add missing packages

2015-08-24 16:15:38 +12:00

Aggregate.php

Revert #3425 #3396 to restore deprecated functionality

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

ArrayList.php

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

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

DatabaseAdmin.php

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

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

DataDifferencer.php

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

2015-06-02 19:13:38 +12:00

DataExtension.php

Revert #3425 #3396 to restore deprecated functionality

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

DataList.php

Revert #3425 #3396 to restore deprecated functionality

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

DataModel.php

Remove all redundant whitespace

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

DataObject.php

Revert #3425 #3396 to restore deprecated functionality

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

DataObjectInterface.php

Remove all redundant whitespace

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

DataQuery.php

FIX: Fixed regression from ClassInfo case-sensitivity fix.

2015-08-07 14:20:01 +12:00

DB.php

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

Filterable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

GroupedList.php

Remove all redundant whitespace

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

HasManyList.php

Remove all redundant whitespace

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

HiddenClass.php

Remove all redundant whitespace

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

Hierarchy.php

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

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

HTMLValue.php

Rewrote usages of error suppression operator

2014-03-05 15:48:55 +13:00

Image_Backend.php

Remove all redundant whitespace

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

Image.php

Merge pull request #4443 from JorisDebonnet/base64url

2015-08-10 13:56:35 +01:00

Limitable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

List.php

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

2015-06-02 19:13:38 +12:00

ListDecorator.php

Remove all redundant whitespace

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

ManyManyList.php

BUG Fix false values for many_many_ExtraFields not being saved

2015-06-09 12:05:25 +12:00

Map.php

Remove all redundant whitespace

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

PolymorphicHasManyList.php

Remove all redundant whitespace

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

RelationList.php

Remove all redundant whitespace

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

Sortable.php

API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List

2014-07-30 11:07:01 +12:00

Transliterator.php

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

2015-06-02 19:13:38 +12:00

UnsavedRelationList.php

Merge remote-tracking branch 'origin/3.1'

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

URLSegmentFilter.php

Remove all redundant whitespace

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

ValidationException.php

Remove all redundant whitespace

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

ValidationResult.php

Remove all redundant whitespace

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

Versioned.php

BUG Fix duplicate primary key crash on duplicate

2015-08-10 09:54:30 +12:00