Simon Welsh fe8dc50ffc Merge branch '3.1' ...

Conflicts:
	tests/view/SSViewerTest.php

2014-03-30 18:17:24 +13:00

..

Boolean.php

l10n key to make "yes" and "no" translatable (see #1749)

2013-04-12 01:11:24 +02:00

CompositeDBField.php

NEW: Added DataObject::getQueriedDatabaseFields() as faster alternative to toMap()

2013-04-21 13:39:11 +12:00

Currency.php

Fixed static config access in Currency and i18n (fixes #8341)

2013-03-26 10:13:51 +01:00

Date.php

NEW Added FormatFromSettings(). Formats dates as per user preferences.

2014-03-17 10:15:59 +13:00

Datetime.php

NEW Added FormatFromSettings(). Formats dates as per user preferences.

2014-03-17 10:15:59 +13:00

DBField.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

DBLocale.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

Decimal.php

FIX: Decimal field change detection.

2013-04-06 23:20:28 +13:00

Double.php

Remove duplicate functionality between float and double

2013-04-17 17:35:59 +12:00

Enum.php

Merge remote-tracking branch 'origin/3.1'

2014-03-16 09:36:48 +13:00

Float.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

ForeignKey.php

Typo

2013-07-12 15:07:43 +12:00

HTMLText.php

NEW Allow specifying element whitelist in HTMLText fields

2014-02-18 14:02:04 +13:00

HTMLVarchar.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

Int.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

Money.php

FIX: Fixes #2398

2013-09-13 12:21:21 +12:00

MultiEnum.php

Revert "Tidy up enum matching where classname is missing"

2014-03-10 09:44:36 -07:00

Percentage.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

PolymorphicForeignKey.php

API Polymorphic has_one behaviour

2014-03-18 09:18:04 +13:00

PrimaryKey.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

StringField.php

FIX: Convert newlines to <br /> tags in string fields (fixes #1942)

2013-05-30 09:26:58 +01:00

Text.php

Revert "Fixes silverstripe/silverstripe-framework#1910: shortcodes not parsed in RSS feeds"

2013-09-30 22:40:47 +02:00

Time.php

NEW Hints for scaffolded date/time fields

2013-04-08 19:38:50 +12:00

Varchar.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

Year.php

FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.

2013-12-16 03:29:29 +00:00