silverstripe-framework/model
Damian Mooyman 574bc6038b Merge 3 into master
# Conflicts:
#	CONTRIBUTING.md
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.EditForm.js
#	admin/javascript/LeftAndMain.js
#	admin/scss/_forms.scss
#	dev/Debug.php
#	docs/en/05_Contributing/01_Code.md
#	forms/DropdownField.php
#	model/DataObject.php
#	model/Versioned.php
#	model/fieldtypes/DBLocale.php
#	tests/forms/gridfield/GridFieldExportButtonTest.yml
#	tests/model/MoneyTest.php
#	tests/model/MoneyTest.yml
#	tests/model/SQLQueryTest.php
2016-05-18 18:36:10 +12:00
..
connect Merge 3 into master 2016-04-29 17:50:55 +12:00
FieldType Merge 3 into master 2016-05-18 18:36:10 +12:00
queries Merge 3 into master 2016-05-18 18:36:10 +12:00
versioning API Campaign preview for images 2016-05-02 15:27:12 +12:00
ArrayList.php Merge 3 into master 2016-04-29 17:50:55 +12:00
DatabaseAdmin.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-15 13:18:47 +12:00
DataDifferencer.php API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
DataExtension.php API File has Versioned extension 2016-02-23 13:46:28 +13:00
DataList.php API Filtering on invalid relation is no longer a silent error 2016-05-03 17:51:16 +12:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php Merge 3 into master 2016-05-18 18:36:10 +12:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php Merge branch '3' 2016-05-12 16:42:48 +01: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 PHPDoc improvements for Hierarchy and Versioned 2016-05-16 12:08:25 +12:00
HTMLValue.php API Update TinyMCE to 4.x 2016-02-23 10:10:02 +13:00
Image_Backend.php Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
Image.php API Campaign preview for images 2016-05-02 15:27:12 +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 API Standardise SS_List::map() implementation 2016-01-25 10:22:47 +13:00
ListDecorator.php Merge pull request #3828 from dhensby/pulls/byids-arraylist 2016-04-26 17:52:22 +12:00
ManyManyList.php API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
Map.php API Standardise SS_List::map() implementation 2016-01-25 10:22:47 +13:00
PolymorphicHasManyList.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Relation.php API Cleanup and refactor of select fields 2016-01-21 15:40:19 +13:00
RelationList.php API Massive refactor of Versioned 2016-03-17 13:43:53 +13: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 branch '3' 2016-05-04 23:36:10 +01:00
URLSegmentFilter.php Remove question marks, equal signs and hashes 2016-01-22 15:40:11 +00:00
ValidationException.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ValidationResult.php API Asset Access Control implementation 2016-01-13 18:18:22 +13:00