silverstripe-framework/model
Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
2015-07-31 15:49:35 +12:00
..
connect Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
fieldtypes Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
queries Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
ArrayList.php Remove all redundant whitespace 2014-08-19 09:17:15 +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 Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
DataList.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +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 2015-06-02 19:13:38 +12:00
HTMLValue.php Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Image_Backend.php Fixed " Image_Backend interface constructor needs updating (master) #3477 " on both the Image_Backend Model and Imagick_Backend filesystem class 2015-02-11 15:58:47 +00:00
Image.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12: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 Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +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 Merge remote-tracking branch 'origin/3' 2015-06-17 15:41:13 +12:00