silverstripe-framework/model
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
..
connect Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
fieldtypes Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
queries Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
ArrayList.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
DatabaseAdmin.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-15 13:18:47 +12:00
DataDifferencer.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
DataExtension.php Revert #3425 #3396 to restore deprecated functionality 2015-08-24 11:26:25 +12:00
DataList.php API Enable linear-only restriction for DataList::applyRelation 2015-12-01 09:58:27 +13:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php API Enable linear-only restriction for DataList::applyRelation 2015-12-01 09:58:27 +13: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 BUG Fix missing framework/admin/tests 2015-09-10 11:06:15 +12:00
HTMLValue.php Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Image_Backend.php API Asset Access Control implementation 2016-01-13 18:18:22 +13:00
Image.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +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 Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
ListDecorator.php Corrected TotalItems() method to use Count(). Added test coverage. (fixes #4646) 2015-11-04 00:20:45 +13:00
ManyManyList.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +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 Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
UnsavedRelationList.php API Enable linear-only restriction for DataList::applyRelation 2015-12-01 09:58:27 +13:00
URLSegmentFilter.php Remove forward slash in URLs in multibyte mode 2015-08-26 17:40:04 +12: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
Versioned.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00