silverstripe-framework/model
Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
..
connect Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
fieldtypes Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
queries Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13: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 Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00: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 NEW: Only validate DataObject model definitions during a build 2015-03-13 16:16:16 +00: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 Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13: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 Resolve merge regressions 2014-11-19 11:05:07 +13: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 Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ListDecorator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ManyManyList.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13: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 Remove all redundant whitespace 2014-08-19 09:17:15 +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 FIX: Versioned not ignoring obsolete fields 2015-02-08 18:42:36 +13:00