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

..

Boolean.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

CompositeDBField.php

API Implement AssetField to edit DBFile fields

2015-10-23 16:57:44 +13:00

Currency.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

Date.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

Datetime.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

DBClassName.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

DBField.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

DBLocale.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Decimal.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Double.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Enum.php

Merge remote-tracking branch 'origin/3'

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

Float.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

ForeignKey.php

API Refactor of File / Folder to use DBFile

2015-10-13 11:57:39 +13:00

HTMLText.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

HTMLVarchar.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Int.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Money.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

MultiEnum.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Percentage.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

PolymorphicForeignKey.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

PrimaryKey.php

API Consolidate DataObject db methods

2015-09-22 10:38:12 +12:00

StringField.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-07-31 11:38:18 +12:00

Text.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

Time.php

API Refactor CompositeDBField into an abstract class

2015-09-22 10:28:07 +12:00

Varchar.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Year.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00