yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7.6' into temp-U4-7009

Browse Source
This commit is contained in:
Shannon
2017-04-18 20:10:27 +10:00
parent 46dd86c745 5c558b0eeb
commit d19bebc404
28 changed files with 184 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/config/umbracoSettings.config
View File

@@ -105,7 +105,7 @@
<!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
<defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
<showDeprecatedPropertyEditors>true</showDeprecatedPropertyEditors>
<showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
<!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
<EnablePropertyValueConverters>true</EnablePropertyValueConverters>

3
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1549,4 +1549,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="enabledConfirm">URL tracker has now been enabled.</key>
<key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
</area>
<area alias="emptyStates">
<key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
</area>
</language>