Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss		2016-02-25 14:51:59 +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	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
Datetime.php	API Refactor CompositeDBField into an abstract class	2015-09-22 10:28:07 +12:00
DBClassName.php	API Refactor out Page default classname hack	2016-01-21 17:12:55 +13:00
DBField.php	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +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	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +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	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	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	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	API Refactor CompositeDBField into an abstract class	2015-09-22 10:28:07 +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