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

Merge remote-tracking branch 'origin/v8/feature/block-editor-list' into v8/feature/block-editor-list-validation

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
This commit is contained in:
Shannon
2020-06-26 10:48:42 +10:00
parent 79bf359fa0 d950de7aa4
commit 8ee9ac7e16
94 changed files with 1302 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -228,7 +228,8 @@
vm.overlayMenu.availableItems.push({
alias: scaffold.contentTypeAlias,
name: scaffold.contentTypeName,
icon: iconHelper.convertFromLegacyIcon(scaffold.icon)
icon: iconHelper.convertFromLegacyIcon(scaffold.icon),
tooltip: scaffold.documentType.description
});
});