Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949

2013-07-19 15:22:05 +02:00
parent 7e24af9daf
commit 90cfd004cb
4 changed files with 60 additions and 4 deletions
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -105,6 +105,9 @@
    
    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd</disallowedUploadFiles>
+
+    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
+    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
  </content>

  <security>