silverstripe-framework/model
Damian Mooyman 0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
..
connect API Use mysql buffered statements 2015-05-08 13:23:53 +12:00
fieldtypes Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
queries Fix merge regressions / errors 2015-06-02 20:19:12 +12:00
ArrayList.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DatabaseAdmin.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataDifferencer.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
DataExtension.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
DataList.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
DB.php NEW Cookie_Backend for managing cookie state 2014-10-06 17:44:51 +13: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 Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Image.php API New and renamed image functions 2015-06-12 17:02:55 -07: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 deletion of orphaned versioned records when a parent _versions table has been deleted 2015-06-09 13:50:09 +12:00