Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5656-ux-doctype-property-creation-journey

# Conflicts: # src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
2020-01-20 19:06:15 +01:00
parent 550a2c5fbf d378495942
commit 9f8d6230d1
83 changed files with 1133 additions and 491 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -134,7 +134,7 @@
        };

        vm.openNodeTypePicker = function ($event) {
-            if (vm.nodes.length >= vm.maxItems) {
+            if (vm.overlayMenu || vm.nodes.length >= vm.maxItems) {
                return;
            }