Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php

2015-07-31 15:49:35 +12:00

..

Boolean.php

Remove all redundant whitespace

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

CompositeDBField.php

Moved deprecation of SQLQuery to 4.0

2014-12-04 09:30:50 +13:00

Currency.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

Date.php

API DateTime.Ago better infers significance of date units.

2014-08-25 10:04:24 +12:00

Datetime.php

Remove all redundant whitespace

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

DBField.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13: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

Remove all redundant whitespace

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

Float.php

Remove all redundant whitespace

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

ForeignKey.php

Replace core uses of DataObject::has_one/has_many/many_many

2015-03-13 16:16:12 +00: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

Remove all redundant whitespace

2014-08-19 09:17:15 +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

Remove all redundant whitespace

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

PrimaryKey.php

Remove all redundant whitespace

2014-08-19 09:17:15 +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

Remove all redundant whitespace

2014-08-19 09:17:15 +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