silverstripe-framework/model/fieldtypes
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +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 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 MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13: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