Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3' ...

Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php

2015-11-03 14:23:16 +13:00

..

How_Tos

Update Dynamic_Default_Fields.md

2015-03-11 16:27:56 +13:00

01_Data_Model_and_ORM.md

API Enable filters to perform 'IS NULL' or 'IS NOT NULL' checks

2015-05-26 12:09:17 +12:00

02_Relations.md

Fixes, tests and documentation for multiple many_manys between the same class

2015-03-13 09:27:23 +00:00

03_Lists.md

developer guides / models

2014-12-15 09:12:47 +13:00

04_Data_Types_and_Casting.md

DOCS: Added default value examples

2015-05-29 14:27:22 -07:00

05_Extending_DataObjects.md

Fix broken link to DataObject api

2015-10-28 11:52:35 +13:00

06_SearchFilters.md

developer guides / models

2014-12-15 09:12:47 +13:00

07_Permissions.md

Model guide documentation

2014-12-15 09:12:47 +13:00

08_SQL_Query.md

DOCS: correct broken links

2015-02-27 16:09:15 -08:00

09_Validation.md

Model guide documentation

2014-12-15 09:12:47 +13:00

10_Versioning.md

Update 10_Versioning.md

2015-01-24 18:24:02 -05:00

11_Scaffolding.md

Update 11_Scaffolding.md

2015-02-12 14:16:05 -05:00

12_Indexes.md

DOCS Update 12_Indexes.md

2015-03-23 10:15:33 +00:00

index.md

Model guide documentation

2014-12-15 09:12:47 +13:00