silverstripe-framework/model
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.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/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
connect Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
fieldtypes Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
queries Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +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 Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
DataExtension.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
DataList.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13: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 Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00