Damian Mooyman 303f695751 Merge 3.3 into 3 ...

# Conflicts:
#	admin/javascript/LeftAndMain.EditForm.js

2016-05-18 17:29:30 +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

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

Datetime.php

Remove all redundant whitespace

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

DBField.php

FIX #5363 Add .JSON option for templates

2016-04-21 17:01:05 +12:00

DBLocale.php

BUG Fix singleton('DBLocale')

2016-05-16 16:16:28 +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

fix #5195: allow empty values in Enum

2016-03-17 22:43:26 +01: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

UPDATE: Add support for user defined charset and collation

2016-02-23 15:40:30 +00: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

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

Text.php

UPDATE: Add support for user defined charset and collation

2016-02-23 15:40:30 +00:00

Time.php

Remove all redundant whitespace

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

Varchar.php

UPDATE: Add support for user defined charset and collation

2016-02-23 15:40:30 +00:00

Year.php

Remove all redundant whitespace

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