From 95b4f9141ef5ee4f335ed7b8cdfb9093a8982235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 14:06:44 +0100
Subject: [PATCH 001/130] test for gathering url for list items so you can
 Ctrl/CMD+click.

---
 .../components/umbcontentgrid.directive.js    |  7 ++++
 .../components/umbtable.directive.js          |  7 ++++
 .../src/views/components/umb-table.html       |  3 +-
 .../grid/grid.listviewlayout.controller.js    | 37 +++++++++++++++++--
 .../listview/layouts/list/list.html           |  1 +
 .../list/list.listviewlayout.controller.js    | 32 ++++++++++++++--
 6 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
index 3994770c8e..5bacda4ecd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
@@ -115,6 +115,12 @@ Use this directive to generate a list of content items presented as a flexbox gr
                scope.onClick(item, $event, $index);
             }
          };
+         
+         scope.getItemUrl = function(item) {
+            if(scope.getItemUrl) {
+               scope.getItemUrl(item);
+            }
+         };
 
          scope.clickItemName = function(item, $event, $index) {
             if(scope.onClickName) {
@@ -131,6 +137,7 @@ Use this directive to generate a list of content items presented as a flexbox gr
          scope: {
             content: '=',
             contentProperties: "=",
+            getItemUrl: "&",
             onClick: "=",
             onClickName: "="
          },
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
index ae41073c0d..1a297f7cc3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
@@ -123,6 +123,12 @@
             }
         };
 
+        vm.getItemUrl = function (item) {
+            if (vm.getItemUrl) {
+                vm.getItemUrl({ item: item});
+            }
+        };
+
         vm.selectItem = function (item, $index, $event) {
             if (vm.onSelect) {
                 vm.onSelect({ item: item, $index: $index, $event: $event });
@@ -171,6 +177,7 @@
                 allowSelectAll: '<',
                 onSelect: '&',
                 onClick: '&',
+                getItemUrl: '&',
                 onSelectAll: '&',
                 onSelectedAll: '&',
                 onSortingDirection: '&',
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index efd212b517..36c5814986 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -40,7 +40,8 @@
                     <i class="umb-table-body__icon umb-table-body__checkicon icon-check"></i>
                 </div>
                 <div class="umb-table-cell umb-table__name">
-                    <a title="{{ item.name }}" class="umb-table-body__link" href=""
+                    <a title="{{ item.name }}" class="umb-table-body__link"
+                       ng-href="vm.getItemUrl(item)"
                        ng-click="vm.clickItem(item, $event)"
                        ng-bind="item.name">
                     </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 9a28627aa1..3060928d7e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -9,7 +9,7 @@
 (function () {
     "use strict";
 
-    function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper) {
+    function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper, editorService) {
 
         var vm = this;
         var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
@@ -115,9 +115,38 @@
         function selectFolder(folder, $event, $index) {
             listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
         }
-
-        function goToItem(item, $event, $index) {
-            $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
+        
+        function getItemUrl(item) {
+            // if item.id is 2147483647 (int.MaxValue) use item.key
+            
+            console.log("request URL for", item)
+            console.log($scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id))
+            
+            return $scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id);
+        }
+        
+        function goToItem(node, $event, $index) {
+            
+            var contentEditor = {
+                id: node.id,
+                submit: function (model) {
+                    // update the node
+                    node.name = model.contentNode.name;
+                    // TODO: node.description = model.contentNode.description;
+                    node.published = model.contentNode.hasPublishedVersion;
+                    if (entityType !== "Member") {
+                        entityResource.getUrl(model.contentNode.id, entityType).then(function (data) {
+                            node.url = data;
+                        });
+                    }
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.contentEditor(contentEditor);
+            
         }
 
         activate();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index 4cfa8c7984..d095adc7e3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -44,6 +44,7 @@
             item-properties="options.includeProperties"
             on-select="vm.selectItem(item, $index, $event)"
             on-click="vm.clickItem(item)"
+            get-item-url="vm.getItemUrl(item)"
             on-select-all="vm.selectAll($event)"
             on-selected-all="vm.isSelectedAll()"
             on-sorting-direction="vm.isSortDirection(col, direction)"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index 00e6c6edb4..881ce7bdcd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -22,6 +22,7 @@
 
         vm.selectItem = selectItem;
         vm.clickItem = clickItem;
+        vm.getItemUrl = getItemUrl;
         vm.selectAll = selectAll;
         vm.isSelectedAll = isSelectedAll;
         vm.isSortDirection = isSortDirection;
@@ -51,10 +52,35 @@
         function selectItem(selectedItem, $index, $event) {
             listViewHelper.selectHandler(selectedItem, $index, $scope.items, $scope.selection, $event);
         }
-
-        function clickItem(item) {
+        
+        function getItemUrl(item) {
             // if item.id is 2147483647 (int.MaxValue) use item.key
-            $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
+            return $scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id);
+        }
+        
+        function clickItem(item) {
+            
+            var contentEditor = {
+                id: node.id,
+                submit: function (model) {
+                    // update the node
+                    node.name = model.contentNode.name;
+                    // TODO: node.description = model.contentNode.description;
+                    node.published = model.contentNode.hasPublishedVersion;
+                    if (entityType !== "Member") {
+                        entityResource.getUrl(model.contentNode.id, entityType).then(function (data) {
+                            node.url = data;
+                        });
+                    }
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.contentEditor(contentEditor);
+            
+            
         }
 
         function isSortDirection(col, direction) {

From 988be21990ef56c6b452fb4a83b28cfa67a08b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Feb 2019 13:20:01 +0100
Subject: [PATCH 002/130] making the grid work in splitview

---
 .../src/less/components/umb-grid.less         | 37 +++++-----
 .../propertyeditors/grid/grid.controller.js   | 68 +++++++++++--------
 .../src/views/propertyeditors/grid/grid.html  | 40 +++++------
 3 files changed, 81 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index e7f24d08fa..6bf8cd612a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -128,9 +128,10 @@
     position: relative;
     margin-bottom: 40px;
     padding-top: 10px;
+    border: 1px solid @grayLighter;
 
     &:hover {
-        background-color: @grayLighter;
+        border-color: @grayLight;
     }
 
     &[ng-click],
@@ -161,15 +162,16 @@
 }
 
 .umb-grid .umb-row .umb-cell-placeholder {
-    min-height: 130px;
-    background-color: @gray-10;
-    border-width: 2px;
+    min-height: 88px;
+    border-width: 1px;
     border-style: dashed;
-    border-color: @gray-8;
+    border-color: @ui-action-disgrete-border;
+    color: @ui-action-disgrete-type;
     transition: border-color 100ms linear;
 
     &:hover {
-        border-color: @blueMid;
+        border-color: @ui-action-disgrete-border-hover;
+        color: @ui-action-disgrete-type-hover;
         cursor: pointer;
     }
 }
@@ -207,9 +209,9 @@
 }
 
 .umb-grid .cell-tools-add {
-    color: @ui-action-type;
+    color: @ui-action-disgrete-type;
     &:focus, &:hover {
-        color: @ui-action-type-hover;
+        color: @ui-action-disgrete-type-hover;
         text-decoration: none;
     }
 }
@@ -219,16 +221,18 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    color: @ui-action-type;
+    color: @ui-action-disgrete-type;
 }
 
 .umb-grid .cell-tools-add.-bar {
     display: block;
-    background: @gray-10;
     text-align: center;
     padding: 5px;
-    border: 1px dashed @gray-7;
+    border: 1px dashed @ui-action-disgrete-border;
     margin: 10px;
+    &:focus, &:hover {
+        border-color: @ui-action-disgrete-border-hover;
+    }
 }
 
 
@@ -249,7 +253,6 @@
 
 .umb-grid .cell-tools-edit {
     display: inline-block;
-    color: @white;
 }
 
 .umb-grid .drop-overlay {
@@ -412,12 +415,12 @@
 
 // Row states
 .umb-grid .umb-row.-active {
-    background-color: @ui-action-type;
+    border-color: @ui-action-type;
 
     .umb-row-title-bar {
         cursor: move;
     }
-
+    /*
     .row-tool,
     .umb-row-title {
         color: @white;
@@ -436,12 +439,13 @@
     .umb-cell .umb-cell-content {
         border-color: transparent;
     }
+    */
 }
 
 
 .umb-grid .umb-row.-active-child {
     background-color: @gray-10;
-
+    
     .umb-row-title-bar {
         cursor: inherit;
     }
@@ -449,7 +453,7 @@
     .umb-row-title {
         color: @gray-3;
     }
-
+    /*
     .row-tool {
         color: fade(@black, 23);
     }
@@ -465,6 +469,7 @@
             border-color: fade(@gray, 44);
         }
     }
+    */
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index b40305f5f5..0ea5842612 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -14,11 +14,16 @@ angular.module("umbraco")
         // Grid status variables
         var placeHolder = "";
         var currentForm = angularHelper.getCurrentForm($scope);
-
+        
+        $scope.currentRowWithActiveChild = null;
+        $scope.currentCellWithActiveChild = null;
+        $scope.active = null;
+        
         $scope.currentRow = null;
         $scope.currentCell = null;
         $scope.currentToolsControl = null;
         $scope.currentControl = null;
+        
         $scope.openRTEToolbarId = null;
         $scope.hasSettings = false;
         $scope.showRowConfigurations = true;
@@ -235,10 +240,16 @@ angular.module("umbraco")
                 }, 500, false);
 
                 $scope.$apply(function () {
-
+                    
+                    console.log("$apply function called...")
+                    
                     var cell = $(e.target).scope().area;
-                    cell.hasActiveChild = hasActiveChild(cell, cell.controls);
-                    cell.active = false;
+                    
+                    if(hasActiveChild(cell, cell.controls)) {
+                        $scope.currentCellWithActiveChild = cell;
+                    }
+                    $scope.active = cell;
+                    
                 });
             }
 
@@ -307,12 +318,13 @@ angular.module("umbraco")
         // Row management function
         // *********************************************
 
-        $scope.clickRow = function(index, rows) {
-            rows[index].active = true;
-        };
-
-        $scope.clickOutsideRow = function(index, rows) {
-            rows[index].active = false;
+        $scope.clickRow = function(index, rows, $event) {
+            console.log("clickRow")
+            //rows[index].active = true;
+            $scope.currentRowWithActiveChild = null;
+            $scope.active = rows[index];
+            
+            $event.stopPropagation();
         };
 
         function getAllowedLayouts(section) {
@@ -359,6 +371,7 @@ angular.module("umbraco")
             if (section.rows.length > 0) {
                 section.rows.splice($index, 1);
                 $scope.currentRow = null;
+                $scope.currentRowWithActiveChild = null;
                 $scope.openRTEToolbarId = null;
                 currentForm.$setDirty();
             }
@@ -513,14 +526,13 @@ angular.module("umbraco")
         // Area management functions
         // *********************************************
 
-        $scope.clickCell = function(index, cells, row) {
-            cells[index].active = true;
-            row.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideCell = function(index, cells, row) {
-            cells[index].active = false;
-            row.hasActiveChild = hasActiveChild(row, cells);
+        $scope.clickCell = function(index, cells, row, $event) {
+            
+            $scope.currentCellWithActiveChild = null;
+            
+            $scope.active = cells[index];
+            $scope.currentRowWithActiveChild = row;
+            $event.stopPropagation();
         };
 
         $scope.cellPreview = function (cell) {
@@ -536,14 +548,14 @@ angular.module("umbraco")
         // *********************************************
         // Control management functions
         // *********************************************
-        $scope.clickControl = function (index, controls, cell) {
-            controls[index].active = true;
-            cell.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideControl = function (index, controls, cell) {
-            controls[index].active = false;
-            cell.hasActiveChild = hasActiveChild(cell, controls);
+        $scope.clickControl = function (index, controls, cell, $event) {
+            
+            console.log("clickControl");
+            
+            $scope.active = controls[index];
+            $scope.currentCellWithActiveChild = cell;
+            
+            $event.stopPropagation();
         };
 
         function hasActiveChild(item, children) {
@@ -594,8 +606,8 @@ angular.module("umbraco")
             if (index === undefined) {
                 index = cell.controls.length;
             }
-
-            newControl.active = true;
+            
+            $scope.active = newControl;
 
             //populate control
             $scope.initControl(newControl, index + 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 22e72daff9..eeb70718f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -69,13 +69,13 @@
                         <!-- ng-mouseleave="disableCurrentRow()"  -->
                         <div class="umb-row"
                              ng-repeat="row in section.rows"
-                             ng-click="clickRow($index, section.rows)"
+                             ng-click="clickRow($index, section.rows, $event)"
                              ng-class="{
                                      '-has-config': row.hasConfig,
-                                     '-active': row.active,
-                                     '-active-child': row.hasActiveChild}"
-                             on-outside-click="clickOutsideRow($index, section.rows)"
-                             bind-click-on="{{row.active}}"
+                                     '-active': row === active,
+                                     '-active-child': row === currentRowWithActiveChild}"
+
+                             bind-click-on="{{row === active || row === currentRowWithActiveChild}}"
                              data-rowid="{{row.$uniqueId}}">
 
                             <div class="umb-row-title-bar">
@@ -89,7 +89,7 @@
                                 </div>
 
                                <!-- Row tool -->
-                               <div class="umb-tools row-tools" ng-show="row.active && !sortMode">
+                               <div class="umb-tools row-tools" ng-show="(row === active || row === currentRowWithActiveChild) && !sortMode">
 
                                    <div class="cell-tools-edit row-tool" ng-if="hasSettings">
                                        <i class="icon icon-settings" title="@grid_settings" localize="title" ng-click="editGridItemSettings(row, 'row')"></i>
@@ -123,17 +123,17 @@
                                                  ng-style="{width: area.$percentage + '%'}"
                                                  ng-class="{
                                                     '-has-config': area.hasConfig,
-                                                    '-active': area.active,
-                                                    '-active-child': area.hasActiveChild}"
+                                                    '-active': area === active,
+                                                    '-active-child': area === currentCellWithActiveChild}"
                                                  ng-model="area.controls"
-                                                 ng-click="clickCell($index, row.areas, row)"
-                                                 on-outside-click="clickOutsideCell($index, row.areas, row)"
-                                                 bind-click-on="{{area.active}}">
+                                                 ng-click="clickCell($index, row.areas, row, $event)"
+
+                                                 bind-click-on="{{area === active}}">
 
                                                  <!-- Cell -->
                                                  <div class="umb-cell-content"
                                                       ng-class="
-                                                        {'-active': area.active,
+                                                        {'-active': area === active,
                                                         '-has-editors': area.controls.length > 0,
                                                         '-collapsed': sortMode}">
 
@@ -153,7 +153,7 @@
                                                          <localize key="grid_settingsApplied" />
                                                       </div>
 
-                                                      <div class="cell-tools" ng-if="area.active && !sortMode">
+                                                      <div class="cell-tools" ng-if="(area === active || area === currentCellWithActiveChild) && !sortMode">
                                                          <div class="cell-tool" ng-click="editGridItemSettings(area, 'cell')">
                                                             <i class="icon-settings"></i>
                                                          </div>
@@ -172,14 +172,14 @@
                                                           <!-- for each control in areas -->
                                                           <div class="umb-control"
                                                               ng-repeat="control in area.controls"
-                                                              ng-click="clickControl($index, area.controls, area)"
-                                                              ng-class="{'-active': control.active}"
-                                                              on-outside-click="clickOutsideControl($index, area.controls, area)"
-                                                              bind-click-on="{{control.active}}"
+                                                              ng-click="clickControl($index, area.controls, area, $event)"
+                                                              ng-class="{'-active': control === active}"
+
+                                                              bind-click-on="{{control === active}}"
                                                               umb-set-dirty-on-change="{{control.value}}"
                                                               data-itemid="{{control.$uniqueId}}">
 
-                                                              <div class="umb-control-click-overlay" ng-show="!control.active && !sortMode"></div>
+                                                              <div class="umb-control-click-overlay" ng-show="control !== active && !sortMode"></div>
 
                                                               <div class="umb-control-collapsed umb-control-handle" ng-show="sortMode">
                                                                   {{control.editor.name}}
@@ -189,11 +189,11 @@
 
                                                                    <div class="umb-control-bar umb-control-handle">
 
-                                                                      <div class="umb-control-title" ng-if="control.active">
+                                                                      <div class="umb-control-title" ng-if="control === active">
                                                                          {{control.editor.name}}
                                                                       </div>
 
-                                                                      <div class="umb-tools" ng-if="control.active">
+                                                                      <div class="umb-tools" ng-if="control === active">
 
                                                                           <div class="umb-control-tool" ng-if="control.editor.config.settings">
                                                                               <i class="umb-control-tool-icon icon-settings" ng-click="editGridItemSettings(control, 'control')"></i>

From 60fa931f3f6c64a97f5350421461f14b99bca507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Feb 2019 14:38:25 +0100
Subject: [PATCH 003/130] Grid-RTE got a unique ID, which fixes TineMCE code,
 which is dependent on a unique ID. #4011

---
 .../components/grid/grid.rte.directive.js          | 14 ++++++--------
 .../src/views/components/grid/grid-rte.html        |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 6472dd3d38..dbbb0e98a2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -13,6 +13,10 @@ angular.module("umbraco.directives")
                 // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
                 var promises = [];
+                
+                var d = new Date();
+                var n = d.getTime();
+                scope.textAreaHtmlId = scope.uniqueId + "_" + n + "_rte";
 
                 //queue file loading
                 if (typeof (tinymce) === "undefined") {
@@ -28,7 +32,7 @@ angular.module("umbraco.directives")
                 var tinyMceEditor = null;
 
                 promises.push(tinyMceService.getTinyMceEditorConfig({
-                    htmlId: scope.uniqueId,
+                    htmlId: scope.textAreaHtmlId,
                     stylesheets: scope.configuration ? scope.configuration.stylesheets : null,
                     toolbar: toolbar,
                     mode: scope.configuration.mode
@@ -132,17 +136,11 @@ angular.module("umbraco.directives")
                         }
 
                     });
-
-                    //listen for formSubmitting event (the result is callback used to remove the event subscription)
-                    var formSubmittingListener = scope.$on("formSubmitting", function () {
-                        scope.value = tinyMceEditor ? tinyMceEditor.getContent() : null;
-                    });
-
+                    
                     //when the element is disposed we need to unsubscribe!
                     // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
                     // element might still be there even after the modal has been hidden.
                     scope.$on('$destroy', function () {
-                        formSubmittingListener();
                         eventsService.unsubscribe(tabShownListener);
                         //ensure we unbind this in case the blur doesn't fire above
                         $('.umb-panel-body').off('scroll', pinToolbar);
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
index f3b854a062..afa9869676 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
@@ -1,3 +1,3 @@
 <div class="umb-rte">
-    <div id="{{uniqueId}}"></div>
+    <div id="{{textAreaHtmlId}}"></div>
 </div>

From 13a326b4673a89fa5694ed81de0ff06470110ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:58:59 +0100
Subject: [PATCH 004/130] remove logs

---
 .../src/views/propertyeditors/grid/grid.controller.js       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 0ea5842612..650717b7c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -240,9 +240,6 @@ angular.module("umbraco")
                 }, 500, false);
 
                 $scope.$apply(function () {
-                    
-                    console.log("$apply function called...")
-                    
                     var cell = $(e.target).scope().area;
                     
                     if(hasActiveChild(cell, cell.controls)) {
@@ -319,7 +316,6 @@ angular.module("umbraco")
         // *********************************************
 
         $scope.clickRow = function(index, rows, $event) {
-            console.log("clickRow")
             //rows[index].active = true;
             $scope.currentRowWithActiveChild = null;
             $scope.active = rows[index];
@@ -550,8 +546,6 @@ angular.module("umbraco")
         // *********************************************
         $scope.clickControl = function (index, controls, cell, $event) {
             
-            console.log("clickControl");
-            
             $scope.active = controls[index];
             $scope.currentCellWithActiveChild = cell;
             

From 2e4091145066435bf8eba2d9e7bce5d1399fbe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:59:30 +0100
Subject: [PATCH 005/130] get uniq ID by using String.CreateGuid()

---
 .../directives/components/grid/grid.rte.directive.js     | 9 +++++----
 .../src/views/propertyeditors/rte/rte.controller.js      | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index dbbb0e98a2..0f933a4ccc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -14,10 +14,11 @@ angular.module("umbraco.directives")
 
                 var promises = [];
                 
-                var d = new Date();
-                var n = d.getTime();
-                scope.textAreaHtmlId = scope.uniqueId + "_" + n + "_rte";
-
+                //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
+                // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
+                // we have this mini content editor panel that can be launched with MNTP.
+                scope.textAreaHtmlId = scope.uniqueId + "_" + String.CreateGuid();
+                
                 //queue file loading
                 if (typeof (tinymce) === "undefined") {
                     promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 6099c5dad4..43da0cb66f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -9,9 +9,7 @@ angular.module("umbraco")
             //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
             // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
             // we have this mini content editor panel that can be launched with MNTP.
-            var d = new Date();
-            var n = d.getTime();
-            $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
+            $scope.textAreaHtmlId = $scope.model.alias + "_" + String.CreateGuid();
 
             var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {

From 44b1a738bf5a4d9ca04b105399d61990ac469bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:59:40 +0100
Subject: [PATCH 006/130] clean up css for grid

---
 .../src/less/components/umb-grid.less         | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 6bf8cd612a..5283e259c7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -420,26 +420,6 @@
     .umb-row-title-bar {
         cursor: move;
     }
-    /*
-    .row-tool,
-    .umb-row-title {
-        color: @white;
-    }
-
-    .umb-grid-has-config {
-        color: fade(@white, 66);
-    }
-
-    .umb-cell {
-        .umb-grid-has-config {
-            color: fade(@black, 44);
-        }
-    }
-
-    .umb-cell .umb-cell-content {
-        border-color: transparent;
-    }
-    */
 }
 
 
@@ -453,23 +433,7 @@
     .umb-row-title {
         color: @gray-3;
     }
-    /*
-    .row-tool {
-        color: fade(@black, 23);
-    }
-
-    .umb-grid-has-config {
-        color: fade(@black, 44);
-    }
-
-    .umb-cell-content.-placeholder {
-        border-color: @gray-8;
-
-        &:hover {
-            border-color: fade(@gray, 44);
-        }
-    }
-    */
+    
 }
 
 

From 3f13baa8e773d9435ae9eab239c7d883881bd193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 11:00:47 +0100
Subject: [PATCH 007/130] make Embed and Media work for Grid in SplitView when
 grid is not allowed to vary.

---
 .../grid/editors/embed.controller.js          | 21 +++++-------------
 .../propertyeditors/grid/editors/embed.html   |  4 ++--
 .../grid/editors/media.controller.js          | 22 ++++++-------------
 .../propertyeditors/grid/editors/media.html   |  4 ++--
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index beb8edab20..17916299bc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -2,24 +2,16 @@ angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.EmbedController",
     function ($scope, $timeout, $sce, editorService) {
 
-        function onInit() {
-            $scope.trustedValue = null;
-            $scope.trustedValue = $sce.trustAsHtml($scope.control.value);
-
-            if(!$scope.control.value) {
-                $timeout(function(){
-                    if($scope.control.$initializing){
-                        $scope.setEmbed();
-                    }
-                }, 200);
-            }
+    	$scope.hasEmbed = function(){
+            return $scope.control.value !== null;
+        }
+    	$scope.getEmbed = function(){
+            return $sce.trustAsHtml($scope.control.value);
         }
-
     	$scope.setEmbed = function(){
             var embed = {
                 submit: function(model) {
                     $scope.control.value = model.embed.preview;
-                    $scope.trustedValue = $sce.trustAsHtml(model.embed.preview);
                     editorService.close();
                 },
                 close: function() {
@@ -28,6 +20,5 @@ angular.module("umbraco")
             };
             editorService.embed(embed);
         };
-
-        onInit();
+        
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 87109e1eb9..32ebfd3257 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,10 +1,10 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
+	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="hasEmbed() === false">
 		<i class="icon icon-movie-alt"></i>
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>
 
-	<div ng-if="control.value" ng-bind-html="trustedValue"></div>
+	<div ng-if="control.value" ng-bind-html="getEmbed()"></div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index e267133cf4..c290b8ae7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -8,13 +8,7 @@ angular.module("umbraco")
                 $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
             });
         }
-
-        function onInit() {
-            if($scope.control.value){
-                $scope.setUrl();
-            }
-        }
-
+        
         $scope.setImage = function(){
             var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
@@ -34,10 +28,8 @@ angular.module("umbraco")
                         id: selectedImage.id,
                         udi: selectedImage.udi,
                         image: selectedImage.image,
-                        altText: selectedImage.altText
-                    };   
-
-                    $scope.setUrl();
+                        caption: selectedImage.altText
+                    };
                     
                     editorService.close();
                 },
@@ -49,7 +41,7 @@ angular.module("umbraco")
             editorService.mediaPicker(mediaPicker);
         };
 
-        $scope.setUrl = function(){
+        $scope.getThumbnailUrl = function(){
 
             if($scope.control.value.image){
                 var url = $scope.control.value.image;
@@ -70,10 +62,10 @@ angular.module("umbraco")
                 {
                     url += "?width=800&upscale=false&animationprocessmode=false"
                 }
-                $scope.url = url;
+                return url;
             }
+            
+            return "";
         };
 
-        onInit();
-
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 7ffb26d831..1a91fe52b8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -7,9 +7,9 @@
 
 	<div ng-if="control.value">
 		<img
-			ng-if="url"
+			ng-if="getThumbnailUrl()"
 			ng-click="setImage()"
-			ng-src="{{url}}"
+			ng-src="{{getThumbnailUrl()}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>

From 6f673184324a90f10109a18e87e60e2b65f76ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:18:01 +0100
Subject: [PATCH 008/130] corrected color variables

---
 .../src/less/components/umb-grid.less                      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 3aab0340a8..5a14294ebf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -542,14 +542,13 @@
     display: inline-block;
     cursor: pointer;
     border-radius: 200px;
-    background: @gray-10;
-    border: 1px solid @gray-7;
+    border: 1px solid @ui-action-disgrete-border;
     margin: 2px;
 
     &:hover, &:hover * {
-        background: @ui-action-type-hover !important;
+        background: @ui-action-disgrete-type-hover !important;
         color: @white !important;
-        border-color: @ui-action-type-hover !important;
+        border-color: @ui-action-disgrete-border-hover !important;
         text-decoration: none;
     }
 }

From 592d8db3e72194eeafa7a52229287ce538e7974c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:18:13 +0100
Subject: [PATCH 009/130] removed comment

---
 .../src/views/propertyeditors/grid/grid.controller.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 650717b7c0..ff01c8cc71 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -316,7 +316,7 @@ angular.module("umbraco")
         // *********************************************
 
         $scope.clickRow = function(index, rows, $event) {
-            //rows[index].active = true;
+            
             $scope.currentRowWithActiveChild = null;
             $scope.active = rows[index];
             

From 564117e62edd23f5e786c9619f02a9f72ad60455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:19:02 +0100
Subject: [PATCH 010/130] Grid editor to use $watch for values that needs to
 transform for presentation

---
 .../grid/editors/embed.controller.js          | 24 ++++++++++++++-----
 .../propertyeditors/grid/editors/embed.html   |  2 +-
 .../grid/editors/media.controller.js          | 22 +++++++++++++----
 .../propertyeditors/grid/editors/media.html   |  5 ++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index 17916299bc..8e9ea06a84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -1,14 +1,26 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.EmbedController",
     function ($scope, $timeout, $sce, editorService) {
-
-    	$scope.hasEmbed = function(){
-            return $scope.control.value !== null;
-        }
-    	$scope.getEmbed = function(){
+        
+        
+        
+    	function getEmbed() {
             return $sce.trustAsHtml($scope.control.value);
         }
-    	$scope.setEmbed = function(){
+        
+        
+        $scope.embedHtml = getEmbed();
+        $scope.$watch('control.value', function(newValue, oldValue) {
+            if(angular.equals(newValue, oldValue)){
+                return; // simply skip that
+            }
+            
+            $scope.embedHtml = getEmbed();
+        }, false);
+    	$scope.hasEmbed = function() {
+            return $scope.control.value !== null;
+        }
+    	$scope.setEmbed = function() {
             var embed = {
                 submit: function(model) {
                     $scope.control.value = model.embed.preview;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 32ebfd3257..0178c3b3ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -5,6 +5,6 @@
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>
 
-	<div ng-if="control.value" ng-bind-html="getEmbed()"></div>
+	<div ng-if="control.value" ng-bind-html="embedHtml"></div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index c290b8ae7d..eb1032a9c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,7 +1,11 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
     function ($scope, $timeout, userService, editorService) {
-
+        
+        
+        $scope.thumbnailUrl = getThumbnailUrl();
+        
+        
         if (!$scope.model.config.startNodeId) {
             userService.getCurrentUser().then(function (userData) {
                 $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
@@ -40,10 +44,18 @@ angular.module("umbraco")
             
             editorService.mediaPicker(mediaPicker);
         };
+        
+        $scope.$watch('control.value', function(newValue, oldValue) {
+            if(angular.equals(newValue, oldValue)){
+                return; // simply skip that
+            }
+            
+            $scope.thumbnailUrl = getThumbnailUrl();
+        }, true);
+        
+        function getThumbnailUrl() {
 
-        $scope.getThumbnailUrl = function(){
-
-            if($scope.control.value.image){
+            if($scope.control.value && $scope.control.value.image) {
                 var url = $scope.control.value.image;
 
                 if($scope.control.editor.config && $scope.control.editor.config.size){
@@ -65,7 +77,7 @@ angular.module("umbraco")
                 return url;
             }
             
-            return "";
+            return null;
         };
 
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 1a91fe52b8..184f707ebf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -5,11 +5,10 @@
         <div ng-id="!control.$inserted" class="help-text"><localize key="grid_clickToInsertImage">Click to insert image</localize></div>
 	</div>
 
-	<div ng-if="control.value">
+	<div ng-if="thumbnailUrl !== null">
 		<img
-			ng-if="getThumbnailUrl()"
 			ng-click="setImage()"
-			ng-src="{{getThumbnailUrl()}}"
+			ng-src="{{thumbnailUrl}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>

From e6951450199707ed40c2036ed6345b660a4ca043 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Sat, 2 Mar 2019 12:06:04 +0100
Subject: [PATCH 011/130] Grid: Hide empty sticky bar

---
 .../src/views/propertyeditors/grid/grid.html                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 22e72daff9..792b22ca9d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -1,10 +1,9 @@
 <div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
 
-    <umb-editor-sub-header style="background-color: white;">
+    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white;">
 
         <umb-editor-sub-header-content-right>
             <umb-button
-                ng-if="showReorderButton()"
                 type="button"
                 icon="icon-navigation"
                 button-style="link"

From 02764e0cccbe1c6f5daa4a4c348c6448fcdb534c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Mar 2019 13:02:59 +0100
Subject: [PATCH 012/130] Implement IPublishedContent Siblings

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index f880076c50..dbd5008b74 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Examine;
 using Umbraco.Web.Composing;
+using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web
 {
@@ -21,6 +22,7 @@ namespace Umbraco.Web
         // see notes in PublishedElementExtensions
         //
         private static IPublishedValueFallback PublishedValueFallback => Current.PublishedValueFallback;
+        private static IPublishedSnapshot PublishedSnapshot => Current.PublishedSnapshot;
 
         #region Urls
 
@@ -235,7 +237,8 @@ namespace Umbraco.Web
         /// </summary>
         /// <param name="contents">The content items.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null).</param>
-        internal static IEnumerable<IPublishedContent> WhereIsInvariantOrHasCulture(this IEnumerable<IPublishedContent> contents, string culture = null)
+        internal static IEnumerable<T> WhereIsInvariantOrHasCulture<T>(this IEnumerable<T> contents, string culture = null)
+            where T : class, IPublishedContent
         {
             if (contents == null) throw new ArgumentNullException(nameof(contents));
 
@@ -1117,6 +1120,52 @@ namespace Umbraco.Web
 
         #endregion
 
+        #region Axes: siblings
+
+        /// <summary>
+        /// Gets the siblings of the content.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <returns>The siblings of the content.</returns>
+        public static IEnumerable<IPublishedContent> Siblings(this IPublishedContent content, string culture = null)
+        {
+            return content.Parent != null
+                ? content.Parent.Children(culture)
+                : PublishedSnapshot.Content.GetAtRoot().WhereIsInvariantOrHasCulture(culture);
+        }
+
+        /// <summary>
+        /// Gets the siblings of the content, of a given content type.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <param name="contentTypeAlias">The content type alias.</param>
+        /// <returns>The siblings of the content, of the given content type.</returns>
+        public static IEnumerable<IPublishedContent> SiblingsOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
+        {
+            return content.Parent != null
+                ? content.Parent.ChildrenOfType(contentTypeAlias, culture)
+                : PublishedSnapshot.Content.GetAtRoot().OfTypes(contentTypeAlias).WhereIsInvariantOrHasCulture(culture);
+        }
+
+        /// <summary>
+        /// Gets the siblings of the content, of a given content type.
+        /// </summary>
+        /// <typeparam name="T">The content type.</typeparam>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <returns>The siblings of the content, of the given content type.</returns>
+        public static IEnumerable<T> Siblings<T>(this IPublishedContent content, string culture = null)
+            where T : class, IPublishedContent
+        {
+            return content.Parent != null
+                ? content.Parent.Children<T>(culture)
+                : PublishedSnapshot.Content.GetAtRoot().OfType<T>().WhereIsInvariantOrHasCulture(culture);
+        }
+
+        #endregion
+
         #region Axes: custom
 
         /// <summary>

From 7b815cfcb3ca7e454eb066ed6661d47d1916fd98 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 5 Mar 2019 21:34:49 +0100
Subject: [PATCH 013/130] Add methods for fetching multiple members to
 UmbracoHelper

---
 src/Umbraco.Web/UmbracoHelper.cs | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 12d4ce1d76..5d39f1c8dd 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -288,6 +288,56 @@ namespace Umbraco.Web
             var asInt = id.TryConvertTo<int>();
             return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
         }
+        
+        public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(IEnumerable<object> ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(params int[] ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(params string[] ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(params Guid[] ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(params Udi[] ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
+
+        public IEnumerable<IPublishedContent> Member(params object[] ids)
+        {
+            return ids.Select(id => Member(id)).WhereNotNull();
+        }
 
         #endregion
 

From 36827cfa9f608659c2c7178b2d8fa8efb3437221 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 8 Mar 2019 07:31:39 +0100
Subject: [PATCH 014/130] Move some of the multiget member methods to
 MembershipHelper

---
 src/Umbraco.Web/Security/MembershipHelper.cs | 35 ++++++++++++++++++++
 src/Umbraco.Web/UmbracoHelper.cs             | 24 +++++++-------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 3bb6951d9a..c2d80257e1 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -289,11 +289,46 @@ namespace Umbraco.Web.Security
             return MemberCache.GetByProviderKey(key);
         }
 
+        public virtual IEnumerable<IPublishedContent> GetByProviderKey(IEnumerable<object> keys)
+        {
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetByProviderKey(params object[] keys)
+        {
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+        }
+
         public virtual IPublishedContent GetById(int memberId)
         {
             return MemberCache.GetById(memberId);
         }
 
+        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<int> memberIds)
+        {
+            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetById(params int[] memberIds)
+        {
+            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+        }
+
+        public virtual IPublishedContent GetById(Guid memberId)
+        {
+            return GetByProviderKey(memberId);
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<Guid> memberIds)
+        {
+            return GetByProviderKey(memberIds.OfType<object>());
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetById(params Guid[] memberIds)
+        {
+            return GetByProviderKey(memberIds.OfType<object>());
+        }
+
         public virtual IPublishedContent GetByUsername(string username)
         {
             return MemberCache.GetByUsername(username);
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 5d39f1c8dd..e9fdfd73e5 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -264,7 +264,7 @@ namespace Umbraco.Web
 
         public IPublishedContent Member(Guid id)
         {
-            return MembershipHelper.GetByProviderKey(id);
+            return MembershipHelper.GetById(id);
         }
 
         public IPublishedContent Member(object id)
@@ -288,55 +288,55 @@ namespace Umbraco.Web
             var asInt = id.TryConvertTo<int>();
             return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
         }
-        
+
         public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return MembershipHelper.GetById(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return MembershipHelper.GetById(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<object> ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(params int[] ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(params string[] ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(params Guid[] ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return MembershipHelper.GetById(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(params Udi[] ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         public IEnumerable<IPublishedContent> Member(params object[] ids)
         {
-            return ids.Select(id => Member(id)).WhereNotNull();
+            return ids.Select(Member).WhereNotNull();
         }
 
         #endregion

From 1098db1632e6dfc2d1fa79ad1e62478680630ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 11 Mar 2019 14:52:16 +0100
Subject: [PATCH 015/130] use item.editPath for new tab URL

---
 .../components/umbcontentgrid.directive.js           | 11 +++--------
 .../directives/components/umbtable.directive.js      | 12 +++---------
 .../src/less/components/umb-content-grid.less        |  4 ++--
 .../src/views/components/umb-content-grid.html       |  7 +++++--
 .../src/views/components/umb-table.html              |  2 +-
 .../layouts/grid/grid.listviewlayout.controller.js   |  9 ---------
 .../propertyeditors/listview/layouts/list/list.html  |  1 -
 .../layouts/list/list.listviewlayout.controller.js   |  4 ++--
 8 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
index 5bacda4ecd..f226d924af 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
@@ -115,17 +115,13 @@ Use this directive to generate a list of content items presented as a flexbox gr
                scope.onClick(item, $event, $index);
             }
          };
-         
-         scope.getItemUrl = function(item) {
-            if(scope.getItemUrl) {
-               scope.getItemUrl(item);
-            }
-         };
 
          scope.clickItemName = function(item, $event, $index) {
-            if(scope.onClickName) {
+            if(scope.onClickName && !($event.metaKey || $event.ctrlKey)) {
                scope.onClickName(item, $event, $index);
+               $event.preventDefault();
             }
+            $event.stopPropagation();
          };
 
       }
@@ -137,7 +133,6 @@ Use this directive to generate a list of content items presented as a flexbox gr
          scope: {
             content: '=',
             contentProperties: "=",
-            getItemUrl: "&",
             onClick: "=",
             onClickName: "="
          },
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
index 1a297f7cc3..3f1929e97d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
@@ -117,16 +117,11 @@
         var vm = this;
 
         vm.clickItem = function (item, $event) {
-            if (vm.onClick) {
+            if (vm.onClick && !($event.metaKey || $event.ctrlKey)) {
                 vm.onClick({ item: item});
-                $event.stopPropagation();
-            }
-        };
-
-        vm.getItemUrl = function (item) {
-            if (vm.getItemUrl) {
-                vm.getItemUrl({ item: item});
+                $event.preventDefault();
             }
+            $event.stopPropagation();
         };
 
         vm.selectItem = function (item, $index, $event) {
@@ -177,7 +172,6 @@
                 allowSelectAll: '<',
                 onSelect: '&',
                 onClick: '&',
-                getItemUrl: '&',
                 onSelectAll: '&',
                 onSelectedAll: '&',
                 onSortingDirection: '&',
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index d2fa2be0c7..2a4a3be2e4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -13,7 +13,6 @@
    user-select: none;
    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
-   
 }
 
 .umb-content-grid__item.-selected {    
@@ -59,7 +58,8 @@
    display: inline-flex;
    
    color: @ui-option-type;
-   &:hover {
+   &:hover, &:focus {
+       text-decoration: none;
        color:@ui-option-type-hover;
    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
index 487be4af87..ce85537d7c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
@@ -10,10 +10,13 @@
 
       <div class="umb-content-grid__content">
 
-        <div class="umb-content-grid__item-name" ng-click="clickItemName(item, $event, $index)" ng-class="{'-light': !item.published && item.updater != null}">
+        <a class="umb-content-grid__item-name"
+           ng-href="{{'#' + item.editPath}}"
+           ng-click="clickItemName(item, $event, $index)"
+           ng-class="{'-light': !item.published && item.updater != null}">
             <i class="umb-content-grid__icon {{ item.icon }}"></i>
             <span>{{ item.name }}</span>
-        </div>
+        </a>
 
         <ul class="umb-content-grid__details-list" ng-class="{'-light': !item.published && item.updater != null}">
             <li class="umb-content-grid__details-item" ng-if="item.state">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index 36c5814986..65955f31eb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -41,7 +41,7 @@
                 </div>
                 <div class="umb-table-cell umb-table__name">
                     <a title="{{ item.name }}" class="umb-table-body__link"
-                       ng-href="vm.getItemUrl(item)"
+                       ng-href="{{'#' + item.editPath}}"
                        ng-click="vm.clickItem(item, $event)"
                        ng-bind="item.name">
                     </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 3060928d7e..70dd2926b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -116,15 +116,6 @@
             listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
         }
         
-        function getItemUrl(item) {
-            // if item.id is 2147483647 (int.MaxValue) use item.key
-            
-            console.log("request URL for", item)
-            console.log($scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id))
-            
-            return $scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id);
-        }
-        
         function goToItem(node, $event, $index) {
             
             var contentEditor = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index d095adc7e3..4cfa8c7984 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -44,7 +44,6 @@
             item-properties="options.includeProperties"
             on-select="vm.selectItem(item, $index, $event)"
             on-click="vm.clickItem(item)"
-            get-item-url="vm.getItemUrl(item)"
             on-select-all="vm.selectAll($event)"
             on-selected-all="vm.isSelectedAll()"
             on-sorting-direction="vm.isSortDirection(col, direction)"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index b796da8d0f..f26f077e66 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -19,7 +19,7 @@
         vm.activeDrag = false;
         vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
         vm.acceptedMediatypes = [];
-
+        
         vm.selectItem = selectItem;
         vm.clickItem = clickItem;
         vm.selectAll = selectAll;
@@ -55,7 +55,7 @@
         function clickItem(item) {
             // if item.id is 2147483647 (int.MaxValue) use item.key
             $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
-                }
+        }
 
         function isSortDirection(col, direction) {
             return listViewHelper.setSortingDirection(col, direction, $scope.options);

From 48ec795e7b9450f036006a2ba3285565554aeb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 11 Mar 2019 14:54:11 +0100
Subject: [PATCH 016/130] do not open as infinite editing yet.

---
 .../grid/grid.listviewlayout.controller.js    | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 70dd2926b6..9a2ff4975d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -116,28 +116,8 @@
             listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
         }
         
-        function goToItem(node, $event, $index) {
-            
-            var contentEditor = {
-                id: node.id,
-                submit: function (model) {
-                    // update the node
-                    node.name = model.contentNode.name;
-                    // TODO: node.description = model.contentNode.description;
-                    node.published = model.contentNode.hasPublishedVersion;
-                    if (entityType !== "Member") {
-                        entityResource.getUrl(model.contentNode.id, entityType).then(function (data) {
-                            node.url = data;
-                        });
-                    }
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.contentEditor(contentEditor);
-            
+        function goToItem(item, $event, $index) {
+            $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
         }
 
         activate();

From 03a5d5b866d8341bb7d618808d0d583476a52173 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 12 Mar 2019 08:20:43 +0100
Subject: [PATCH 017/130] Allow mixing languages with and without region

---
 src/Umbraco.Web/Editors/LanguageController.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs
index 64132d3d8e..e1c0c61303 100644
--- a/src/Umbraco.Web/Editors/LanguageController.cs
+++ b/src/Umbraco.Web/Editors/LanguageController.cs
@@ -103,6 +103,13 @@ namespace Umbraco.Web.Editors
             // this is prone to race conditions but the service will not let us proceed anyways
             var existing = Services.LocalizationService.GetLanguageByIsoCode(language.IsoCode);
 
+            // the localization service might return the generic language even when queried for specific ones (e.g. "da" when queried for "da-DK")
+            // - we need to handle that explicitly
+            if (existing.IsoCode != language.IsoCode)
+            {
+                existing = null;
+            }
+
             if (existing != null && language.Id != existing.Id)
             {
                 //someone is trying to create a language that already exist

From e550e5cd8159ac7f08d8fb3c7d35b0d82c2c56a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 12 Mar 2019 10:35:04 +0100
Subject: [PATCH 018/130] rename LESS variables with disgrete to discreet

---
 .../src/less/components/editor.less                  |  8 ++++----
 .../src/less/components/umb-file-dropzone.less       |  4 ++--
 .../src/less/components/umb-media-grid.less          |  2 +-
 .../src/less/components/umb-node-preview.less        |  8 ++++----
 .../src/less/components/umb-packages.less            |  4 ++--
 src/Umbraco.Web.UI.Client/src/less/listview.less     |  8 ++++----
 src/Umbraco.Web.UI.Client/src/less/panel.less        |  4 ++--
 .../src/less/property-editors.less                   |  4 ++--
 src/Umbraco.Web.UI.Client/src/less/variables.less    | 12 ++++++------
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 0770a895c0..b8ff6a6554 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -167,7 +167,7 @@ a.umb-editor-header__close-split-view:hover {
 	text-decoration: none !important;
 	font-size: 13px;
 	//color: @gray-4;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	//background-color: @white;
 }
 
@@ -175,15 +175,15 @@ a.umb-variant-switcher__toggle {
 	transition: color 0.2s ease-in-out;
 	&:hover {
 		//background-color: @gray-10;
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         .umb-variant-switcher__expand {
-            color: @ui-action-disgrete-type-hover;
+            color: @ui-action-discreet-type-hover;
         }
 	}
 }
 
 .umb-variant-switcher__expand {
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	margin-top: 3px;
 	margin-left: 5px;
 	margin-right: -5px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
index b5021d7c38..5071091fcc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
@@ -41,13 +41,13 @@
   // file select link
   .file-select {
     font-size: 15px;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
     cursor: pointer;
 
     margin-top: 10px;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         text-decoration: none;
     }
   }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 7a6cd043a4..41e8a2892c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -211,7 +211,7 @@
     transition: opacity 150ms;
     
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index b054ddf907..d52cb918f6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -89,16 +89,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    border: 1px dashed @ui-action-disgrete-border;
-    color: @ui-action-disgrete-type;
+    border: 1px dashed @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @ui-action-disgrete-type-hover;
-    border-color: @ui-action-disgrete-border-hover;
+    color: @ui-action-discreet-type-hover;
+    border-color: @ui-action-discreet-border-hover;
     text-decoration: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
index daee29351c..f704dd48e2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
@@ -408,7 +408,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail {
     flex: 0 1 100px;
-    border: 1px solid @ui-action-disgrete-border;
+    border: 1px solid @ui-action-discreet-border;
     border-radius: 3px;
     margin: 5px;
     padding: 10px;
@@ -418,7 +418,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail:hover {
     cursor: pointer;
-    border-color: @ui-action-disgrete-border-hover;
+    border-color: @ui-action-discreet-border-hover;
 }
 
 /* PACKAGE LIST */
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index 8b5a295752..b3de3e575d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -239,8 +239,8 @@
 
 .list-view-add-layout {
    margin-top: 10px;
-   color: @ui-action-disgrete-type;
-   border: 1px dashed @ui-action-disgrete-border;
+   color: @ui-action-discreet-type;
+   border: 1px dashed @ui-action-discreet-border;
    display: flex;
    align-items: center;
    justify-content: center;
@@ -250,6 +250,6 @@
 
 .list-view-add-layout:hover {
    text-decoration: none;
-   color: @ui-action-disgrete-type-hover;
-   border-color: @ui-action-disgrete-border-hover;
+   color: @ui-action-discreet-type-hover;
+   border-color: @ui-action-discreet-border-hover;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index a8c1efe1d3..bad0ab9715 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -346,7 +346,7 @@
   justify-content: center;
   align-items: center;
   background: @white;
-  border: 1px solid @ui-action-disgrete-border;
+  border: 1px solid @ui-action-discreet-border;
   animation: fadeIn 0.5s;
   border-radius: 3px;
   width: 50px;
@@ -354,7 +354,7 @@
       .icon {
           opacity: 0.8;
       }
-      border-color: @ui-action-disgrete-border-hover;
+      border-color: @ui-action-discreet-border-hover;
   }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index e021a577a5..279163d64b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -269,8 +269,8 @@
     transition: all 150ms ease-in-out;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
-        border-color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-type-hover;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 19098b8a98..6a8fe00dd7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -162,12 +162,12 @@
 @ui-action-border:             @blueExtraDark;
 @ui-action-border-hover:       @blueMid;
 
-@ui-action-disgrete:              white;
-@ui-action-disgrete-hover:        @sand-7;
-@ui-action-disgrete-type:         @blueExtraDark;
-@ui-action-disgrete-type-hover:   @blueMid;
-@ui-action-disgrete-border:         @gray-7;
-@ui-action-disgrete-border-hover:   @blueMid;
+@ui-action-discreet:              white;
+@ui-action-discreet-hover:        @sand-7;
+@ui-action-discreet-type:         @blueExtraDark;
+@ui-action-discreet-type-hover:   @blueMid;
+@ui-action-discreet-border:         @gray-7;
+@ui-action-discreet-border-hover:   @blueMid;
 
 @type-white:                      @white;
 @type-black:                      @blueNight;

From 1f7172e98dc4306c28dc2f2a5f4b9349d646d3ea Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 12 Mar 2019 21:54:13 +0000
Subject: [PATCH 019/130] Cleaned up class names in logviewer overview to use
 new logviewer classes and made a logviewer specific less stylesheet. Also
 left aligned the saved searches to make them look better

---
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../src/less/components/umb-logviewer.less    | 42 +++++++++++++++++++
 .../src/views/logviewer/overview.html         | 10 ++---
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less

diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 88988485fe..82fe416319 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -137,6 +137,7 @@
 @import "components/umb-iconpicker.less";
 @import "components/umb-insert-code-box.less";
 @import "components/umb-packages.less";
+@import "components/umb-logviewer.less";
 @import "components/umb-package-local-install.less";
 @import "components/umb-panel-group.less";
 @import "components/umb-lightbox.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
new file mode 100644
index 0000000000..f7aa0e4558
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
@@ -0,0 +1,42 @@
+/* PACKAGE DETAILS */
+
+.umb-logviewer {
+    display: flex;
+    flex-flow: row wrap;
+}
+
+@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
+
+.umb-logviewer__main-content {
+    flex: 1 1 auto;
+    margin-right: 20px;
+    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
+    min-width: 500px;
+
+    .btn-link {
+        text-align: left;
+    }
+}
+
+.umb-logviewer__sidebar {
+    flex: 0 0 @sidebarwidth;
+}
+
+@media (max-width: 768px) {
+
+    .umb-logviewer {
+        flex-direction: column;
+    }
+
+    .umb-logviewer__main-content {
+        flex: 1 1 auto;
+        width: 100%;
+        margin-bottom: 30px;
+        margin-right: 0;        
+    }
+
+    .umb-logviewer__sidebar {
+        flex: 1 1 auto;
+        width: 100%;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 67d89e5ee7..a46853f97e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -1,4 +1,4 @@
-<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.OverviewController as vm" class="clearfix">
+<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.OverviewController as vm" class="clearfix" id="logview">
 
     <umb-editor-view footer="false">
 
@@ -24,8 +24,8 @@
                 </umb-box>
             </div>
 
-            <div class="umb-package-details" ng-show="!vm.loading && vm.canLoadLogs">
-                <div class="umb-package-details__main-content">
+            <div class="umb-logviewer" ng-show="!vm.loading && vm.canLoadLogs">
+                <div class="umb-logviewer__main-content">
                     <!-- Saved Searches -->
                     <umb-box>
                         <umb-box-header title="Saved Searches"></umb-box-header>
@@ -68,7 +68,7 @@
                     </umb-box>
                 </div>
 
-                <div class="umb-package-details__sidebar">
+                <div class="umb-logviewer__sidebar">
                     <!-- No of Errors -->
                     <umb-box ng-click="vm.searchLogQuery('Has(@Exception)')" style="cursor:pointer;">
                         <umb-box-header title="Number of Errors"></umb-box-header>
@@ -95,4 +95,4 @@
             </div>
         </umb-editor-container>
     </umb-editor-view>
-</div>
\ No newline at end of file
+</div>

From 6d88726479b17338dcc2f3860a4b423ade7fff7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Mar 2019 11:46:33 +0100
Subject: [PATCH 020/130] Fixing code in sync functionality of checkbox-list

---
 .../checkboxlist/checkboxlist.controller.js   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 5ba9746c6e..43e50dc392 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -33,9 +33,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         }
 
         function updateViewModel(configItems) {
-
-            //check if it's already in sync
-
+            
             //get the checked vals from the view model
             var selectedVals = _.map(
                 _.filter($scope.selectedItems,
@@ -47,22 +45,23 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                     return m.value;
                 }
             );
-            //get all of the same values between the arrays
-            var same = _.intersection($scope.model.value, selectedVals);
-            //if the lengths are the same as the value, then we are in sync, just exit
-
-            if (same.length === $scope.model.value.length === selectedVals.length) {
+            
+            //if the length is zero, then we are in sync, just exit.
+            if (_.difference($scope.model.value, selectedVals).length === 0) {
+                debugger;
                 return;
             }
 
             $scope.selectedItems = [];
-
+            
+            var iConfigItem;
             for (var i = 0; i < configItems.length; i++) {
-                var isChecked = _.contains($scope.model.value, configItems[i].value);
+                iConfigItem = configItems[i];
+                var isChecked = _.contains($scope.model.value, iConfigItem.value);
                 $scope.selectedItems.push({
                     checked: isChecked,
-                    key: configItems[i].id,
-                    val: configItems[i].value
+                    key: iConfigItem.id,
+                    val: iConfigItem.value
                 });
             }
         }

From 53e6c620eb13a9ee8e862953b1108d72ddb6295c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Mar 2019 14:45:30 +0100
Subject: [PATCH 021/130] fixes 4627 + makes front-end validations appear as
 soon as they are invalid again.

---
 .../directives/validation/valpropertymsg.directive.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 9ee83dc2ba..c027e0778e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -62,8 +62,8 @@ function valPropertyMsg(serverValidationManager) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-
-                            if (!newValue || angular.equals(newValue, oldValue)) {
+                            
+                            if (angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
@@ -78,10 +78,12 @@ function valPropertyMsg(serverValidationManager) {
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
-                                stopWatch();
+                            } else if (showValidation && scope.errorMsg === "") {
+                                formCtrl.$setValidity('valPropertyMsg', false);
+                                scope.errorMsg = getErrorMsg();
                             }
                         }, true);
                 }
@@ -152,6 +154,7 @@ function valPropertyMsg(serverValidationManager) {
                 showValidation = true;
                 if (hasError && scope.errorMsg === "") {
                     scope.errorMsg = getErrorMsg();
+                    startWatch();
                 }
                 else if (!hasError) {
                     scope.errorMsg = "";

From b0b987f9cd70b03a97fe57ef9bfbb7e8ae155d66 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Tue, 12 Mar 2019 08:31:28 +0100
Subject: [PATCH 022/130] Merge pull request #4710 from
 umbraco/temp8-4708-fix-for-exit-preview-with-null-culture

Fix for exit preview with null culture

(cherry picked from commit 9b25cdaa142c1545067b9155b91c51fe558cc700)
---
 .../src/preview/preview.controller.js                      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 7d6584d2f1..4733c58556 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -113,7 +113,12 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
+            var relativeUrl = "/" +  $scope.pageId;
+            
+            if(culture){
+                relativeUrl +='?culture='+ culture;
+            }
+            
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 

From 541c7e69552db1a22af6f904eba32e44a03afd8f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:27:22 +0100
Subject: [PATCH 023/130] NuCache: cleanup scoped objects

---
 .../Scoping/ScopeContextualBase.cs            | 33 +++++++++++++++--
 .../NuCache/PublishedSnapshotService.cs       | 36 +++++++++----------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 7461142234..1f2b6155e6 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -2,24 +2,43 @@
 
 namespace Umbraco.Core.Scoping
 {
-    // base class for an object that will be enlisted in scope context, if any. it
-    // must be used in a 'using' block, and if not scoped, released when disposed,
-    // else when scope context runs enlisted actions
+    /// <summary>
+    /// Provides a base class for scope contextual objects.
+    /// </summary>
+    /// <remarks>
+    /// <para>A scope contextual object is enlisted in the current scope context,
+    /// if any, and released when the context exists. It must be used in a 'using'
+    /// block, and will be released when disposed, if not part of a scope.</para>
+    /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
         private bool _using, _scoped;
 
+        /// <summary>
+        /// Gets a contextual object.
+        /// </summary>
+        /// <typeparam name="T">The type of the object.</typeparam>
+        /// <param name="scopeProvider">A scope provider.</param>
+        /// <param name="key">A context key for the object.</param>
+        /// <param name="ctor">A function producing the contextual object.</param>
+        /// <returns>The contextual object.</returns>
+        /// <remarks>
+        /// <para></para>
+        /// </remarks>
         public static T Get<T>(IScopeProvider scopeProvider, string key, Func<bool, T> ctor)
             where T : ScopeContextualBase
         {
+            // no scope context = create a non-scoped object
             var scopeContext = scopeProvider.Context;
             if (scopeContext == null)
                 return ctor(false);
 
+            // create & enlist the scoped object
             var w = scopeContext.Enlist("ScopeContextualBase_" + key,
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
+            // the object can be 'used' only once at a time
             if (w._using) throw new InvalidOperationException("panic: used.");
             w._using = true;
             w._scoped = true;
@@ -27,6 +46,10 @@ namespace Umbraco.Core.Scoping
             return w;
         }
 
+        /// <inheritdoc />
+        /// <remarks>
+        /// <para>If not scoped, then this releases the contextual object.</para>
+        /// </remarks>
         public void Dispose()
         {
             _using = false;
@@ -35,6 +58,10 @@ namespace Umbraco.Core.Scoping
                 Release(true);
         }
 
+        /// <summary>
+        /// Releases the contextual object.
+        /// </summary>
+        /// <param name="completed">A value indicating whether the scoped operation completed.</param>
         public abstract void Release(bool completed);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e19531a25b..541ff2ea23 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -330,14 +330,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadContent(Action<IScope> action)
         {
+            // first get a writer, then a scope
+            // if there already is a scope, the writer will attach to it
+            // otherwise, it will only exist here - cheap
             using (_contentStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.ContentTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.ContentTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -399,14 +400,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadMedia(Action<IScope> action)
         {
+            // see note in LockAndLoadContent
             using (_mediaStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.MediaTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.MediaTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -528,14 +528,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadDomains()
         {
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.Domains);
-                    LoadDomainsLocked();
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.Domains);
+                LoadDomainsLocked();
+                scope.Complete();
             }
         }
 
@@ -858,6 +857,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_isReady == false)
                 return;
 
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
             {
                 foreach (var payload in payloads)

From 66f9ecd8e2eac19a2ca6566f8cc982f1fe561f9d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:30:55 +0100
Subject: [PATCH 024/130] NuCache: rename things

---
 .../Cache/SnapDictionaryTests.cs              | 10 ++--
 .../PublishedCache/NuCache/ContentStore.cs    | 56 ++++++++---------
 .../PublishedCache/NuCache/SnapDictionary.cs  | 60 +++++++++----------
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 013dbadbb8..0ee0d180c3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -388,8 +388,8 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenerationObject genObj;
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
+            SnapDictionary<int, string>.GenObj genObj;
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
@@ -399,14 +399,14 @@ namespace Umbraco.Tests.Cache
             GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakReference.IsAlive); // snapshot is gone, along with its reference
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
 
             await d.CollectAsync();
 
             Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
             Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenerationObjects.Count);
+            Assert.AreEqual(0, d.Test.GenObjs.Count);
             Assert.AreEqual(0, d.SnapCount); // snapshot is gone
             Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index b3996050a6..e78c4d419e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -29,8 +29,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
-        private readonly ConcurrentQueue<GenRefRef> _genRefRefs;
-        private GenRefRef _genRefRef;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -64,8 +64,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<PublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
             _xmap = new ConcurrentDictionary<Guid, int>();
 
-            _genRefRefs = new ConcurrentQueue<GenRefRef>();
-            _genRefRef = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -836,8 +836,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _genRefRef != null)
-                    return new Snapshot(this, _genRefRef.GetGenRef()
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                         , _logger
 #endif
@@ -852,15 +852,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_genRefRef == null)
-                        _genRefRefs.Enqueue(_genRefRef = new GenRefRef(snapGen));
-                    else if (_genRefRef.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _genRefRefs.Enqueue(_genRefRef = new GenRefRef(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -873,7 +873,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genRefRef.GetGenRef()
+                var snapshot = new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                     , _logger
 #endif
@@ -930,10 +930,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 #if DEBUG
             _logger.Debug<ContentStore>("Collect.");
 #endif
-            while (_genRefRefs.TryPeek(out GenRefRef genRefRef) && (genRefRef.Count == 0 || genRefRef.WGenRef.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _genRefRefs.TryDequeue(out genRefRef); // cannot fail since TryPeek has succeeded
-                _floorGen = genRefRef.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
 #if DEBUG
                 //_logger.Debug<ContentStore>("_floorGen=" + _floorGen + ", _liveGen=" + _liveGen);
 #endif
@@ -1009,9 +1009,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 await task;
         }
 
-        public long GenCount => _genRefRefs.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _genRefRefs.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -1100,7 +1100,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _store = store;
                 _genRef = genRef;
                 _gen = genRef.Gen;
-                Interlocked.Increment(ref genRef.GenRefRef.Count);
+                Interlocked.Increment(ref genRef.GenObj.Count);
                 //_thisCount = _count++;
 
 #if DEBUG
@@ -1201,46 +1201,46 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
 #if DEBUG
-                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenRefRef.Count.ToString() ?? "live");
+                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
-                    Interlocked.Decrement(ref _genRef.GenRefRef.Count);
+                    Interlocked.Decrement(ref _genRef.GenObj.Count);
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenRefRef
+        internal class GenObj
         {
-            public GenRefRef(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WGenRef = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
             public GenRef GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WGenRef.Target;
+                var genRef = (GenRef) WeakGenRef.Target;
                 if (genRef == null)
-                    WGenRef.Target = genRef = new GenRef(this, Gen);
+                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
                 return genRef;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WGenRef;
+            public readonly WeakReference WeakGenRef;
             public int Count;
         }
 
         internal class GenRef
         {
-            public GenRef(GenRefRef genRefRef, long gen)
+            public GenRef(GenObj genObj, long gen)
             {
-                GenRefRef = genRefRef;
+                GenObj = genObj;
                 Gen = gen;
             }
 
-            public readonly GenRefRef GenRefRef;
+            public readonly GenObj GenObj;
             public readonly long Gen;
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 30f6e7e638..eebbe3122f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // Readers are lock-free
 
         private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
-        private readonly ConcurrentQueue<GenerationObject> _generationObjects;
-        private GenerationObject _generationObject;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -41,8 +41,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public SnapDictionary()
         {
             _items = new ConcurrentDictionary<TKey, LinkedNode>();
-            _generationObjects = new ConcurrentQueue<GenerationObject>();
-            _generationObject = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -339,8 +339,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _generationObject != null)
-                    return new Snapshot(this, _generationObject.GetReference());
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef());
 
                 // else we need to try to create a new gen ref
                 // whether we are wlocked or not, noone can rlock while we do,
@@ -351,15 +351,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_generationObject == null)
-                        _generationObjects.Enqueue(_generationObject = new GenerationObject(snapGen));
-                    else if (_generationObject.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _generationObjects.Enqueue(_generationObject = new GenerationObject(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -372,7 +372,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _generationObject.GetReference());
+                var snapshot = new Snapshot(this, _genObj.GetGenRef());
 
                 // reading _floorGen is safe if _collectTask is null
                 if (_collectTask == null && _collectAuto && _liveGen - _floorGen > CollectMinGenDelta)
@@ -416,10 +416,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void Collect()
         {
             // see notes in CreateSnapshot
-            while (_generationObjects.TryPeek(out GenerationObject generationObject) && (generationObject.Count == 0 || generationObject.WeakReference.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _generationObjects.TryDequeue(out generationObject); // cannot fail since TryPeek has succeeded
-                _floorGen = generationObject.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
             }
 
             Collect(_items);
@@ -490,9 +490,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             //    await task;
         }
 
-        public long GenCount => _generationObjects.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _generationObjects.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -520,7 +520,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
-            public ConcurrentQueue<GenerationObject> GenerationObjects => _dict._generationObjects;
+            public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);
 
@@ -586,8 +586,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 _store = store;
                 _generationReference = generationReference;
-                _gen = generationReference.GenerationObject.Gen;
-                _generationReference.GenerationObject.Reference();
+                _gen = generationReference.GenObj.Gen;
+                _generationReference.GenObj.Reference();
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -634,30 +634,30 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
                 _gen = -1;
-                _generationReference?.GenerationObject.Release();
+                _generationReference?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenerationObject
+        internal class GenObj
         {
-            public GenerationObject(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WeakReference = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
-            public GenerationReference GetReference()
+            public GenerationReference GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakReference.Target;
+                var generationReference = (GenerationReference) WeakGenRef.Target;
                 if (generationReference == null)
-                    WeakReference.Target = generationReference = new GenerationReference(this);
+                    WeakGenRef.Target = generationReference = new GenerationReference(this);
                 return generationReference;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WeakReference;
+            public readonly WeakReference WeakGenRef;
             public int Count;
 
             public void Reference()
@@ -673,12 +673,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         internal class GenerationReference
         {
-            public GenerationReference(GenerationObject generationObject)
+            public GenerationReference(GenObj genObj)
             {
-                GenerationObject = generationObject;
+                GenObj = genObj;
             }
 
-            public readonly GenerationObject GenerationObject;
+            public readonly GenObj GenObj;
         }
 
         #endregion

From b7a03f01538c7ba5b42374146a87619913e2dca8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 16:03:39 +0100
Subject: [PATCH 025/130] NuCache: reorg some classes

---
 .../Cache/SnapDictionaryTests.cs              |  4 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 53 +-----------
 .../PublishedCache/NuCache/Snap/GenObj.cs     | 37 +++++++++
 .../PublishedCache/NuCache/Snap/GenRef.cs     | 13 +++
 .../PublishedCache/NuCache/Snap/LinkedNode.cs | 20 +++++
 .../PublishedCache/NuCache/SnapDictionary.cs  | 80 +++----------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  3 +
 7 files changed, 87 insertions(+), 123 deletions(-)
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 0ee0d180c3..82c27ebc38 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -5,6 +5,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.Cache
 {
@@ -388,8 +389,7 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenObj genObj;
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index e78c4d419e..dd5805daa1 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -8,6 +8,7 @@ using CSharpTest.Net.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -1061,24 +1062,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode<TValue>
-            where TValue: class
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode<TValue> Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly ContentStore _store;
@@ -1210,40 +1193,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenRef GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WeakGenRef.Target;
-                if (genRef == null)
-                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
-                return genRef;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-        }
-
-        internal class GenRef
-        {
-            public GenRef(GenObj genObj, long gen)
-            {
-                GenObj = genObj;
-                Gen = gen;
-            }
-
-            public readonly GenObj GenObj;
-            public readonly long Gen;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
new file mode 100644
index 0000000000..b69dab7dac
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenObj
+    {
+        public GenObj(long gen)
+        {
+            Gen = gen;
+            WeakGenRef = new WeakReference(null);
+        }
+
+        public GenRef GetGenRef()
+        {
+            // not thread-safe but always invoked from within a lock
+            var genRef = (GenRef)WeakGenRef.Target;
+            if (genRef == null)
+                WeakGenRef.Target = genRef = new GenRef(this);
+            return genRef;
+        }
+
+        public readonly long Gen;
+        public readonly WeakReference WeakGenRef;
+        public int Count;
+
+        public void Reference()
+        {
+            Interlocked.Increment(ref Count);
+        }
+
+        public void Release()
+        {
+            Interlocked.Decrement(ref Count);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
new file mode 100644
index 0000000000..ade0251b8d
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenRef
+    {
+        public GenRef(GenObj genObj)
+        {
+            GenObj = genObj;
+        }
+
+        public readonly GenObj GenObj;
+        public long Gen => GenObj.Gen;
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
new file mode 100644
index 0000000000..20d7e7ddcd
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
@@ -0,0 +1,20 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class LinkedNode<TValue>
+        where TValue : class
+    {
+        public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
+        {
+            Value = value;
+            Gen = gen;
+            Next = next;
+        }
+
+        public readonly long Gen;
+
+        // reading & writing references is thread-safe on all .NET platforms
+        // mark as volatile to ensure we always read the correct value
+        public volatile TValue Value;
+        public volatile LinkedNode<TValue> Next;
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index eebbe3122f..f117a395b5 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -20,7 +21,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // This class is optimized for many readers, few writers
         // Readers are lock-free
 
-        private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
+        private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
         private readonly ConcurrentQueue<GenObj> _genObjs;
         private GenObj _genObj;
         private readonly object _wlocko = new object();
@@ -40,7 +41,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public SnapDictionary()
         {
-            _items = new ConcurrentDictionary<TKey, LinkedNode>();
+            _items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
             _genObjs = new ConcurrentQueue<GenObj>();
             _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
@@ -198,9 +199,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _items.Count;
 
-        private LinkedNode GetHead(TKey key)
+        private LinkedNode<TValue> GetHead(TKey key)
         {
-            _items.TryGetValue(key, out LinkedNode link); // else null
+            _items.TryGetValue(key, out var link); // else null
             return link;
         }
 
@@ -221,7 +222,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         // for an older gen - if value is different then insert a new
                         // link for the new gen, with the new value
                         if (link.Value != value)
-                            _items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
+                            _items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
                     }
                     else
                     {
@@ -235,7 +236,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
                 else
                 {
-                    _items.TryAdd(key, new LinkedNode(value, _liveGen));
+                    _items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
                 }
             }
             finally
@@ -261,7 +262,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (kvp.Value.Gen < _liveGen)
                     {
-                        var link = new LinkedNode(null, _liveGen, kvp.Value);
+                        var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
                         _items.TryUpdate(kvp.Key, link, kvp.Value);
                     }
                     else
@@ -425,7 +426,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Collect(_items);
         }
 
-        private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
+        private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
         {
             // it is OK to enumerate a concurrent dictionary and it does not lock
             // it - and here it's not an issue if we skip some items, they will be
@@ -460,7 +461,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // not live, null value, no next link = remove that one -- but only if
                     // the dict has not been updated, have to do it via ICollection<> (thanks
                     // Mr Toub) -- and if the dict has been updated there is nothing to collect
-                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
+                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
                     /*var removed =*/ idict.Remove(kvp);
                     //Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
                     continue;
@@ -526,7 +527,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public GenVal[] GetValues(TKey key)
             {
-                _dict._items.TryGetValue(key, out LinkedNode link); // else null
+                _dict._items.TryGetValue(key, out var link); // else null
 
                 if (link == null)
                     return new GenVal[0];
@@ -559,23 +560,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
@@ -639,48 +623,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenerationReference GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakGenRef.Target;
-                if (generationReference == null)
-                    WeakGenRef.Target = generationReference = new GenerationReference(this);
-                return generationReference;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-
-            public void Reference()
-            {
-                Interlocked.Increment(ref Count);
-            }
-
-            public void Release()
-            {
-                Interlocked.Decrement(ref Count);
-            }
-        }
-
-        internal class GenerationReference
-        {
-            public GenerationReference(GenObj genObj)
-            {
-                GenObj = genObj;
-            }
-
-            public readonly GenObj GenObj;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 09cc7d856a..c6cbc7cbaa 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -205,6 +205,9 @@
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />

From dc3e985fbbdd7d3049bfce837873a926b1ee1509 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:43:37 +0100
Subject: [PATCH 026/130] NuCache: troubleshooting

---
 .../Cache/SnapDictionaryTests.cs              | 174 ++++++++++++++++--
 .../PublishedCache/NuCache/ContentStore.cs    |   7 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 105 +++++++----
 3 files changed, 233 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 82c27ebc38..eb034eec26 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -712,16 +712,102 @@ namespace Umbraco.Tests.Cache
         }
 
         [Test]
-        public void NestedWriteLocking()
+        public void NestedWriteLocking1()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // no scope context: writers nest, last one to be disposed commits
+
+            var scopeProvider = GetScopeProvider();
+
+            using (var w1 = d.GetWriter(scopeProvider))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2); // get a new writer each time
+
+                    d.Set(1, "one");
+
+                    Assert.AreEqual(0, d.CreateSnapshot().Gen);
+                }
+
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                Assert.AreEqual(0, d.CreateSnapshot().Gen);
+            }
+
+            Assert.AreEqual(1, t.LiveGen);
+            Assert.AreEqual(0, t.WLocked);
+            Assert.IsTrue(t.NextGen);
+
+            Assert.AreEqual(1, d.CreateSnapshot().Gen);
+        }
+
+        [Test]
+        public void NestedWriteLocking2()
         {
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            var scopeProvider = GetScopeProvider();
-            using (d.GetWriter(scopeProvider))
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // scope context: writers enlist
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider))
             {
-                using (d.GetWriter(scopeProvider))
+                using (var w2 = d.GetWriter(scopeProvider))
                 {
+                    Assert.AreSame(w1, w2);
+
+                    d.Set(1, "one");
+                }
+            }
+        }
+
+        [Test]
+        public void NestedWriteLocking3()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider1 = GetScopeProvider();
+            var scopeProvider2 = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider1))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider2))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2);
+
                     d.Set(1, "one");
                 }
             }
@@ -846,7 +932,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProvider = GetScopeProvider(true);
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -867,7 +954,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            ((ScopeContext) scopeProvider.Context).ScopeExit(true);
+            scopeContext.ScopeExit(true);
 
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(3, s5.Gen);
@@ -878,7 +965,8 @@ namespace Umbraco.Tests.Cache
         public void ScopeLocking2()
         {
             var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+            var t = d.Test;
+            t.CollectAuto = false;
 
             // gen 1
             d.Set(1, "one");
@@ -891,10 +979,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProviderMock = new Mock<IScopeProvider>();
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+
             var scopeContext = new ScopeContext();
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -905,18 +994,72 @@ namespace Umbraco.Tests.Cache
                 Assert.AreEqual(2, s3.Gen);
                 Assert.AreEqual("uno", s3.Get(1));
 
+                // we made some changes, so a next gen is required
+                Assert.AreEqual(3, t.LiveGen);
+                Assert.IsTrue(t.NextGen);
+                Assert.AreEqual(1, t.WLocked);
+
                 // but live snapshot contains changes
-                var ls = d.Test.LiveSnapshot;
+                var ls = t.LiveSnapshot;
                 Assert.AreEqual("ein", ls.Get(1));
                 Assert.AreEqual(3, ls.Gen);
             }
 
+            // nothing is committed until scope exits
+            Assert.AreEqual(3, t.LiveGen);
+            Assert.IsTrue(t.NextGen);
+            Assert.AreEqual(1, t.WLocked);
+
+            // no changes until exit
             var s4 = d.CreateSnapshot();
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
+            // fixme - remove debugging code
+            /*
+            Exception caught = null;
+            var genFlip = 0;
+            var lckFlip = 0;
+            var thread = new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    for (var i = 0; i < 20; i++)
+                    {
+                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
+                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
+                        d.CreateSnapshot();
+                        System.Threading.Thread.Sleep(500);
+                    }
+                }
+                catch (Exception e)
+                {
+                    caught = e;
+                }
+            });
+            thread.Start();
+            */
+
             scopeContext.ScopeExit(false);
 
+            // fixme - remove debugging code
+            /*
+            thread.Join();
+
+            Assert.IsNull(caught); // but then how can it be not null?
+
+            Console.WriteLine(genFlip);
+            Console.WriteLine(lckFlip);
+            Assert.AreEqual(1, genFlip);
+            Assert.AreEqual(10, lckFlip);
+            */
+
+            // now things have changed
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+            Assert.AreEqual(0, t.WLocked);
+
+            // no changes since not completed
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(2, s5.Gen);
             Assert.AreEqual("uno", s5.Get(1));
@@ -955,12 +1098,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
-        private IScopeProvider GetScopeProvider(bool withContext = false)
+        private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
-            var scopeProviderMock = new Mock<IScopeProvider>();
-            var scopeContext = withContext ? new ScopeContext() : null;
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = Mock.Of<IScopeProvider>();
+            Mock.Get(scopeProvider)
+                .Setup(x => x.Context).Returns(scopeContext);
             return scopeProvider;
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index dd5805daa1..2548046e23 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -95,7 +95,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class ContentStoreWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private ContentStore _store;
+            private readonly ContentStore _store;
+            private int _released;
 
             public ContentStoreWriter(ContentStore store, bool scoped)
             {
@@ -105,9 +106,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_store== null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _store.Release(_lockinfo, completed);
-                _store = null;
             }
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index f117a395b5..1d462f1b76 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -90,7 +90,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class SnapDictionaryWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private SnapDictionary<TKey, TValue> _dictionary;
+            private readonly SnapDictionary<TKey, TValue> _dictionary;
+            private int _released;
 
             public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
@@ -100,14 +101,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_dictionary == null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _dictionary.Release(_lockinfo, completed);
-                _dictionary = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
+        // the dict is write-locked until the write-lock is released
+        //  which happens when it is disposed (non-scoped)
+        //  or when the scope context exits (scoped)
         public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
             return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
@@ -130,13 +135,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //RuntimeHelpers.PrepareConstrainedRegions();
                 try { } finally
                 {
+                    // increment the lock count, and register that this lock is counting
                     _wlocked++;
                     lockInfo.Count = true;
+
+                    // fixme - this comment: "ok to have holes in generation objects" is annoying
+                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
+                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
+                    //
+                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
+                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
+
                     if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                         _liveGen += 1;
                     }
                 }
@@ -154,6 +168,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
         {
+            // if the lock wasn't taken in the first place, do nothing
+            if (!lockInfo.Taken)
+                return;
+
             if (commit == false)
             {
                 var rtaken = false;
@@ -162,6 +180,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Monitor.Enter(_rlocko, ref rtaken);
                     try { } finally
                     {
+                        // forget about the temp. liveGen
                         _nextGen = false;
                         _liveGen -= 1;
                     }
@@ -184,8 +203,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
+            // fixme - pretend we need to do something that takes time
+            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
+
+            // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
-            if (lockInfo.Taken) Monitor.Exit(_wlocko);
+            Monitor.Exit(_wlocko);
         }
 
         private void Release(ReadLockInfo lockInfo)
@@ -338,12 +361,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 Lock(lockInfo);
 
-                // if no next generation is required, and we already have one,
-                // use it and create a new snapshot
+                // if no next generation is required, and we already have a gen object,
+                // use it to create a new snapshot
                 if (_nextGen == false && _genObj != null)
                     return new Snapshot(this, _genObj.GetGenRef());
 
-                // else we need to try to create a new gen ref
+                // else we need to try to create a new gen object
                 // whether we are wlocked or not, noone can rlock while we do,
                 // so _liveGen and _nextGen are safe
                 if (_wlocked > 0) // volatile, cannot ++ but could --
@@ -351,26 +374,32 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // write-locked, cannot use latest gen (at least 1) so use previous
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
-                    // create a new gen ref unless we already have it
+                    // create a new gen object if we don't already have one
+                    // (happens the first time a snapshot is created)
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+
+                    // fixme - getting a panic exception here
+                    // means _genObj != null, means _nextGen == true
+
+                    // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
-                    // not write-locked, can use latest gen, create a new gen ref
+                    // not write-locked, can use latest gen (_liveGen), create a corresponding new gen object
                     _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
                 // so...
-                // the genRefRef has a weak ref to the genRef, and is queued
-                // the snapshot has a ref to the genRef, which has a ref to the genRefRef
-                // when the snapshot is disposed, it decreases genRefRef counter
+                // the genObj has a weak ref to the genRef, and is queued
+                // the snapshot has a ref to the genRef, which has a ref to the genObj
+                // when the snapshot is disposed, it decreases genObj counter
                 // so after a while, one of these conditions is going to be true:
-                // - the genRefRef counter is zero because all snapshots have properly been disposed
-                // - the genRefRef weak ref is dead because all snapshots have been collected
+                // - genObj.Count is zero because all snapshots have properly been disposed
+                // - genObj.WeakGenRef is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
                 var snapshot = new Snapshot(this, _genObj.GetGenRef());
@@ -486,7 +515,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 task = _collectTask;
             }
-            return task ?? Task.FromResult(0);
+            return task ?? Task.CompletedTask;
             //if (task != null)
             //    await task;
         }
@@ -514,6 +543,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             public long LiveGen => _dict._liveGen;
             public long FloorGen => _dict._floorGen;
             public bool NextGen => _dict._nextGen;
+            public int WLocked => _dict._wlocked;
 
             public bool CollectAuto
             {
@@ -563,15 +593,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
-            private readonly GenerationReference _generationReference;
-            private long _gen; // copied for perfs
+            private readonly GenRef _genRef;
+            private readonly long _gen; // copied for perfs
+            private int _disposed;
 
-            internal Snapshot(SnapDictionary<TKey, TValue> store, GenerationReference generationReference)
+            //private static int _count;
+            //private readonly int _thisCount;
+
+            internal Snapshot(SnapDictionary<TKey, TValue> store, GenRef genRef)
             {
                 _store = store;
-                _generationReference = generationReference;
-                _gen = generationReference.GenObj.Gen;
-                _generationReference.GenObj.Reference();
+                _genRef = genRef;
+                _gen = genRef.GenObj.Gen;
+                _genRef.GenObj.Reference();
+                //_thisCount = _count++;
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -580,17 +615,21 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _gen = gen;
             }
 
+            private void EnsureNotDisposed()
+            {
+                if (_disposed > 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+            }
+
             public TValue Get(TKey key)
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.Get(key, _gen);
             }
 
             public IEnumerable<TValue> GetAll()
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.GetAll(_gen);
             }
 
@@ -598,8 +637,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _store.IsEmpty(_gen);
                 }
             }
@@ -608,17 +646,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _gen;
                 }
             }
 
             public void Dispose()
             {
-                if (_gen < 0) return;
-                _gen = -1;
-                _generationReference?.GenObj.Release();
+                if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
+                    return;
+                _genRef?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }

From 260a8ad8748c3d9eb2669590c58927865194c074 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 18:56:23 +0100
Subject: [PATCH 027/130] NuCache: fix panic exception

---
 .../Cache/SnapDictionaryTests.cs              | 81 +++++++++++++++++++
 .../PublishedCache/NuCache/ContentStore.cs    |  4 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 15 +---
 3 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index eb034eec26..e4ca35fbd3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -1098,6 +1098,87 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
+        [Test]
+        public void DontPanic()
+        {
+            var d = new SnapDictionary<int, string>();
+            d.Test.CollectAuto = false;
+
+            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+
+            // gen 1
+            d.Set(1, "one");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj); // set with lock
+
+            var s1 = d.CreateSnapshot();
+            Assert.IsFalse(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            Assert.AreEqual(1, s1.Gen);
+            Assert.AreEqual("one", s1.Get(1));
+
+            d.Set(1, "uno");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(2, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            // scopeProvider.Context == scopeContext -> writer is scoped
+            // writer is scope contextual and scoped
+            //  when disposed, nothing happens
+            //  when the context exists, the writer is released
+            using (d.GetWriter(scopeProvider))
+            {
+                d.Set(1, "ein");
+                Assert.IsTrue(d.Test.NextGen);
+                Assert.AreEqual(3, d.Test.LiveGen);
+                Assert.IsNotNull(d.Test.GenObj);
+                Assert.AreEqual(2, d.Test.GenObj.Gen);
+            }
+
+            // writer has not released
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+
+            // nothing changed
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+
+            // panic!
+            var s2 = d.CreateSnapshot();
+
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            // release writer
+            scopeContext.ScopeExit(true);
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            var s3 = d.CreateSnapshot();
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(3, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsFalse(d.Test.NextGen);
+        }
+
         private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
             var scopeProvider = Mock.Of<IScopeProvider>();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2548046e23..2b9c9bee4d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -133,11 +133,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _wlocked++;
                     lockInfo.Count = true;
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true;
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -214,7 +215,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 else
                     dictionary.TryUpdate(key, link.Next, link);
             }
-
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 1d462f1b76..73904d1452 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -139,18 +139,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _wlocked++;
                     lockInfo.Count = true;
 
-                    // fixme - this comment: "ok to have holes in generation objects" is annoying
-                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
-                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
-                    //
-                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
-                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
-
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true; // this is the ONLY place where _nextGen becomes true
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -379,9 +373,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
 
-                    // fixme - getting a panic exception here
-                    // means _genObj != null, means _nextGen == true
-
                     // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
@@ -551,6 +542,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
+            public GenObj GenObj => _dict._genObj;
+
             public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);

From e24b22f6bd1a06ba79b9420c51a38a18afef6f7c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 15 Mar 2019 12:20:24 +1100
Subject: [PATCH 028/130] Fixes the authorization for certain endpoints by non
 admins so that data cannot be seen and avatars cannot be changed

---
 src/Umbraco.Web/Editors/UsersController.cs    |  3 ++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 .../Filters/AdminUsersAuthorizeAttribute.cs   | 42 +++++++++++++++++++
 .../UmbracoApplicationAuthorizeAttribute.cs   |  3 +-
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs

diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index dbfcf64ce2..932f10f343 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -82,6 +82,7 @@ namespace Umbraco.Web.Editors
 
         [AppendUserModifiedHeader("id")]
         [FileUploadCleanupFilter(false)]
+        [AdminUsersAuthorize]
         public async Task<HttpResponseMessage> PostSetAvatar(int id)
         {
             return await PostSetAvatarInternal(Request, Services.UserService, ApplicationContext.ApplicationCache.StaticCache, id);
@@ -145,6 +146,7 @@ namespace Umbraco.Web.Editors
         }
 
         [AppendUserModifiedHeader("id")]
+        [AdminUsersAuthorize]
         public HttpResponseMessage PostClearAvatar(int id)
         {
             var found = Services.UserService.GetUserById(id);
@@ -183,6 +185,7 @@ namespace Umbraco.Web.Editors
         /// <param name="id"></param>
         /// <returns></returns>
         [OutgoingEditorModelEvent]
+        [AdminUsersAuthorize]
         public UserDisplay GetById(int id)
         {
             var user = Services.UserService.GetUserById(id);
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 036cb96b50..759e6b47f3 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -832,6 +832,7 @@
     <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
     <Compile Include="WebApi\Binders\MemberBinder.cs" />
     <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
+    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
     <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
     <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
diff --git a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
new file mode 100644
index 0000000000..8701eaf226
--- /dev/null
+++ b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
@@ -0,0 +1,42 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using Umbraco.Core;
+using Umbraco.Web.Editors;
+
+namespace Umbraco.Web.WebApi.Filters
+{
+    /// <summary>
+    /// if the user being edited is an admin then we must ensure that the current user is also an admin
+    /// </summary>
+    public sealed class AdminUsersAuthorizeAttribute : AuthorizeAttribute
+    {
+        protected override bool IsAuthorized(HttpActionContext actionContext)
+        {
+            if (actionContext.ActionArguments.TryGetValue("id", out var userId) == false)
+            {
+                var queryString = actionContext.Request.GetQueryNameValuePairs();
+                var ids = queryString.Where(x => x.Key == "id").ToArray();
+                if (ids.Length == 0)
+                    return base.IsAuthorized(actionContext);
+                userId = ids[0].Value;
+            }
+
+            if (userId == null) return base.IsAuthorized(actionContext);
+            var intUserId = userId.TryConvertTo<int>();
+            if (intUserId.Success == false)
+                return base.IsAuthorized(actionContext);
+
+            var user = ApplicationContext.Current.Services.UserService.GetUserById(intUserId.Result);
+            if (user == null)
+                return base.IsAuthorized(actionContext);
+
+            //Perform authorization here to see if the current user can actually save this user with the info being requested
+            var authHelper = new UserEditorAuthorizationHelper(ApplicationContext.Current.Services.ContentService, ApplicationContext.Current.Services.MediaService, ApplicationContext.Current.Services.UserService, ApplicationContext.Current.Services.EntityService);
+            var canSaveUser = authHelper.IsAuthorized(UmbracoContext.Current.Security.CurrentUser, user, null, null, null);
+            return canSaveUser;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
index 1899584d6f..bc8370c0d5 100644
--- a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Web.Http;
 using System.Web.Http.Controllers;
 
 namespace Umbraco.Web.WebApi.Filters
@@ -41,4 +40,4 @@ namespace Umbraco.Web.WebApi.Filters
             return authorized;
         }
     }
-}
\ No newline at end of file
+}

From d74ec8f8cb531fa631caa2050cfcac91b9654e64 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 15 Mar 2019 12:39:46 +1100
Subject: [PATCH 029/130] Authorizes more endpoints for admin/non-admins

---
 src/Umbraco.Web/Editors/UsersController.cs    |  9 +++-
 .../Filters/AdminUsersAuthorizeAttribute.cs   | 44 ++++++++++++-------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index 932f10f343..0588eef2c0 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -605,12 +605,13 @@ namespace Umbraco.Web.Editors
             
             display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/operationSavedHeader"), Services.TextService.Localize("speechBubbles/editUserSaved"));
             return display;
-        }        
+        }
 
         /// <summary>
         /// Disables the users with the given user ids
         /// </summary>
         /// <param name="userIds"></param>
+        [AdminUsersAuthorize("userIds")]
         public HttpResponseMessage PostDisableUsers([FromUri]int[] userIds)
         {
             if (userIds.Contains(Security.GetUserId()))
@@ -641,6 +642,7 @@ namespace Umbraco.Web.Editors
         /// Enables the users with the given user ids
         /// </summary>
         /// <param name="userIds"></param>
+        [AdminUsersAuthorize("userIds")]
         public HttpResponseMessage PostEnableUsers([FromUri]int[] userIds)
         {
             var users = Services.UserService.GetUsersById(userIds).ToArray();
@@ -664,6 +666,7 @@ namespace Umbraco.Web.Editors
         /// Unlocks the users with the given user ids
         /// </summary>
         /// <param name="userIds"></param>
+        [AdminUsersAuthorize("userIds")]
         public async Task<HttpResponseMessage> PostUnlockUsers([FromUri]int[] userIds)
         {
             if (userIds.Length <= 0)
@@ -696,6 +699,7 @@ namespace Umbraco.Web.Editors
                 Services.TextService.Localize("speechBubbles/unlockUsersSuccess", new[] { userIds.Length.ToString() }));
         }
 
+        [AdminUsersAuthorize("userIds")]
         public HttpResponseMessage PostSetUserGroupsOnUsers([FromUri]string[] userGroupAliases, [FromUri]int[] userIds)
         {
             var users = Services.UserService.GetUsersById(userIds).ToArray();
@@ -721,7 +725,8 @@ namespace Umbraco.Web.Editors
         /// Limited to users that haven't logged in to avoid issues with related records constrained
         /// with a foreign key on the user Id
         /// </remarks>
-        public async Task<HttpResponseMessage> PostDeleteNonLoggedInUser(int id)
+        [AdminUsersAuthorize]
+        public HttpResponseMessage PostDeleteNonLoggedInUser(int id)
         {
             var user = Services.UserService.GetUserById(id);
             if (user == null)
diff --git a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
index 8701eaf226..e9cb1d8c6e 100644
--- a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
@@ -9,34 +9,48 @@ using Umbraco.Web.Editors;
 namespace Umbraco.Web.WebApi.Filters
 {
     /// <summary>
-    /// if the user being edited is an admin then we must ensure that the current user is also an admin
+    /// if the users being edited is an admin then we must ensure that the current user is also an admin
     /// </summary>
+    /// <remarks>
+    /// This will authorize against one or multiple ids
+    /// </remarks>
     public sealed class AdminUsersAuthorizeAttribute : AuthorizeAttribute
     {
+        private readonly string _parameterName;
+
+        public AdminUsersAuthorizeAttribute(string parameterName)
+        {
+            _parameterName = parameterName;
+        }
+
+        public AdminUsersAuthorizeAttribute() : this("id")
+        {            
+        }
+
         protected override bool IsAuthorized(HttpActionContext actionContext)
         {
-            if (actionContext.ActionArguments.TryGetValue("id", out var userId) == false)
+            int[] userIds;
+            if (actionContext.ActionArguments.TryGetValue(_parameterName, out var userId))
+            {
+                var intUserId = userId.TryConvertTo<int>();
+                if (intUserId)
+                    userIds = new[] {intUserId.Result};
+                else return base.IsAuthorized(actionContext);
+            }
+            else
             {
                 var queryString = actionContext.Request.GetQueryNameValuePairs();
-                var ids = queryString.Where(x => x.Key == "id").ToArray();
+                var ids = queryString.Where(x => x.Key == _parameterName).ToArray();
                 if (ids.Length == 0)
                     return base.IsAuthorized(actionContext);
-                userId = ids[0].Value;
+                userIds = ids.Select(x => x.Value.TryConvertTo<int>()).Where(x => x.Success).Select(x => x.Result).ToArray();
             }
 
-            if (userId == null) return base.IsAuthorized(actionContext);
-            var intUserId = userId.TryConvertTo<int>();
-            if (intUserId.Success == false)
-                return base.IsAuthorized(actionContext);
+            if (userIds.Length == 0) return base.IsAuthorized(actionContext);
 
-            var user = ApplicationContext.Current.Services.UserService.GetUserById(intUserId.Result);
-            if (user == null)
-                return base.IsAuthorized(actionContext);
-
-            //Perform authorization here to see if the current user can actually save this user with the info being requested
+            var users = ApplicationContext.Current.Services.UserService.GetUsersById(userIds);
             var authHelper = new UserEditorAuthorizationHelper(ApplicationContext.Current.Services.ContentService, ApplicationContext.Current.Services.MediaService, ApplicationContext.Current.Services.UserService, ApplicationContext.Current.Services.EntityService);
-            var canSaveUser = authHelper.IsAuthorized(UmbracoContext.Current.Security.CurrentUser, user, null, null, null);
-            return canSaveUser;
+            return users.All(user => authHelper.IsAuthorized(UmbracoContext.Current.Security.CurrentUser, user, null, null, null) != false);
         }
     }
 }

From a6568e1952b8e71d451f062042b03d1a8de2c95a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 19:48:44 +0100
Subject: [PATCH 030/130] NuCache: better fixing, cleanup

---
 .../Scoping/ScopeContextualBase.cs            |  7 +-
 .../Cache/SnapDictionaryTests.cs              | 67 +++++--------------
 .../PublishedCache/NuCache/ContentStore.cs    | 13 ++--
 .../NuCache/PublishedSnapshotService.cs       | 18 ++---
 .../PublishedCache/NuCache/SnapDictionary.cs  | 18 ++---
 5 files changed, 39 insertions(+), 84 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 1f2b6155e6..25f176d471 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Scoping
     /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
-        private bool _using, _scoped;
+        private bool _scoped;
 
         /// <summary>
         /// Gets a contextual object.
@@ -38,9 +38,6 @@ namespace Umbraco.Core.Scoping
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
-            // the object can be 'used' only once at a time
-            if (w._using) throw new InvalidOperationException("panic: used.");
-            w._using = true;
             w._scoped = true;
 
             return w;
@@ -52,8 +49,6 @@ namespace Umbraco.Core.Scoping
         /// </remarks>
         public void Dispose()
         {
-            _using = false;
-
             if (_scoped == false)
                 Release(true);
         }
diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index e4ca35fbd3..b435af9e77 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -632,7 +632,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(1, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 var s1 = d.CreateSnapshot();
 
@@ -685,7 +685,7 @@ namespace Umbraco.Tests.Cache
             Assert.IsFalse(d.Test.NextGen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -724,13 +724,13 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -770,9 +770,9 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreSame(w1, w2);
 
@@ -794,13 +794,13 @@ namespace Umbraco.Tests.Cache
             var scopeProvider1 = GetScopeProvider();
             var scopeProvider2 = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider1))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider1))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider2))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -850,7 +850,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -895,7 +895,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -935,7 +935,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -985,7 +985,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -1015,45 +1015,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            // fixme - remove debugging code
-            /*
-            Exception caught = null;
-            var genFlip = 0;
-            var lckFlip = 0;
-            var thread = new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    for (var i = 0; i < 20; i++)
-                    {
-                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
-                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
-                        d.CreateSnapshot();
-                        System.Threading.Thread.Sleep(500);
-                    }
-                }
-                catch (Exception e)
-                {
-                    caught = e;
-                }
-            });
-            thread.Start();
-            */
-
             scopeContext.ScopeExit(false);
 
-            // fixme - remove debugging code
-            /*
-            thread.Join();
-
-            Assert.IsNull(caught); // but then how can it be not null?
-
-            Console.WriteLine(genFlip);
-            Console.WriteLine(lckFlip);
-            Assert.AreEqual(1, genFlip);
-            Assert.AreEqual(10, lckFlip);
-            */
-
             // now things have changed
             Assert.AreEqual(2, t.LiveGen);
             Assert.IsFalse(t.NextGen);
@@ -1104,13 +1067,13 @@ namespace Umbraco.Tests.Cache
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+            Assert.IsNull(d.Test.GenObj);
 
             // gen 1
             d.Set(1, "one");
             Assert.IsTrue(d.Test.NextGen);
             Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj); // set with lock
+            Assert.IsNull(d.Test.GenObj);
 
             var s1 = d.CreateSnapshot();
             Assert.IsFalse(d.Test.NextGen);
@@ -1134,7 +1097,7 @@ namespace Umbraco.Tests.Cache
             // writer is scope contextual and scoped
             //  when disposed, nothing happens
             //  when the context exists, the writer is released
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 d.Set(1, "ein");
                 Assert.IsTrue(d.Test.NextGen);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2b9c9bee4d..7ab4a64f31 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -92,13 +92,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ContentStoreWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly ContentStore _store;
             private int _released;
 
-            public ContentStoreWriter(ContentStore store, bool scoped)
+            public ScopedWriteLock(ContentStore store, bool scoped)
             {
                 _store = store;
                 store.Lock(_lockinfo, scoped);
@@ -114,9 +114,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         // gets a scope contextual representing a locked writer to the dictionary
         // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -137,9 +137,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true;
                     }
                 }
             }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 541ff2ea23..9c5587fbd5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -333,7 +333,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // first get a writer, then a scope
             // if there already is a scope, the writer will attach to it
             // otherwise, it will only exist here - cheap
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.ContentTree);
@@ -401,7 +401,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadMedia(Action<IScope> action)
         {
             // see note in LockAndLoadContent
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.MediaTree);
@@ -529,7 +529,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadDomains()
         {
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.Domains);
@@ -586,7 +586,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool draftChanged2, out bool publishedChanged2);
                 draftChanged = draftChanged2;
@@ -682,7 +682,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool anythingChanged2);
                 anythingChanged = anythingChanged2;
@@ -803,7 +803,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
 
-            using (store.GetWriter(_scopeProvider))
+            using (store.GetScopedWriteLock(_scopeProvider))
             {
                 // ReSharper disable AccessToModifiedClosure
                 action(removedIds, refreshedIds, otherIds, newIds);
@@ -824,8 +824,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
-            using (_contentStore.GetWriter(_scopeProvider))
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
@@ -858,7 +858,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
 
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             {
                 foreach (var payload in payloads)
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 73904d1452..c5b1df1206 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -87,13 +87,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class SnapDictionaryWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly SnapDictionary<TKey, TValue> _dictionary;
             private int _released;
 
-            public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
+            public ScopedWriteLock(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
                 _dictionary = dictionary;
                 dictionary.Lock(_lockinfo, scoped);
@@ -108,14 +108,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
-        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
         // the dict is write-locked until the write-lock is released
         //  which happens when it is disposed (non-scoped)
         //  or when the scope context exits (scoped)
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -143,9 +141,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                     }
                 }
             }
@@ -197,9 +196,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
-            // fixme - pretend we need to do something that takes time
-            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
-
             // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
             Monitor.Exit(_wlocko);

From 688173488d3af4632ea9b7088a3312eb63d84d62 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 15 Mar 2019 09:26:21 +0100
Subject: [PATCH 031/130] Automatically close "Cultures and Hostnames" on
 successful save

---
 .../src/views/content/content.assigndomain.controller.js         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 0f27f3046c..165aec63cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -116,6 +116,7 @@
                     if(response.valid) {
 
                         vm.submitButtonState = "success";
+                        closeDialog();
 
                     // show validation messages for each domain
                     } else {

From 8f06603774468e975f3c0faf8f9a371aa85d1216 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 17 Mar 2019 20:51:42 +0100
Subject: [PATCH 032/130] Fix the "Language" dropdown in the "Culture and
 Hostnames" dialog

---
 .../src/views/content/content.assigndomain.controller.js       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 0f27f3046c..5fa1eebd0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -46,8 +46,7 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language.Id);
-
+                            return matchLanguageById(l, data.language);
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];

From 44beb81e719703b0b3a693def58dba70d665346b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 18 Mar 2019 09:51:05 +0100
Subject: [PATCH 033/130] Avoid removing a public method (used by forms 8.0.0)

---
 src/Umbraco.Web/Editors/EditorModelEventManager.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
index b61a359e83..40c45ca8c3 100644
--- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs
+++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Web.Http.Filters;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Events;
@@ -15,11 +17,15 @@ namespace Umbraco.Web.Editors
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MediaItemDisplay>> SendingMediaModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MemberDisplay>> SendingMemberModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<UserDisplay>> SendingUserModel;
-        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>>> SendingDashboardModel;
+
+        [Obsolete("Please Use SendingDashboardModelV2")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboard>>>> SendingDashboardModel;
+        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>>> SendingDashboardModelV2;
 
         private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>> e)
         {
-            var handler = SendingDashboardModel;
+            var handler = SendingDashboardModelV2;
             handler?.Invoke(sender, e);
         }
 

From 212b0ba93226988c8c904929bf260f320b22dcf3 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 18 Mar 2019 10:14:23 +0100
Subject: [PATCH 034/130] Missing injection

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 471 +++++-------------
 .../dashboard/dashboard.tabs.controller.js    |   2 +-
 2 files changed, 131 insertions(+), 342 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 487c50bddb..b996db214c 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1104,7 +1104,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1113,8 +1112,7 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1172,7 +1170,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
@@ -1218,7 +1216,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
       "dev": true
     },
     "asap": {
@@ -1271,7 +1269,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
       "dev": true
     },
     "asynckit": {
@@ -1525,7 +1523,6 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1535,15 +1532,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1559,7 +1554,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1748,8 +1742,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1768,7 +1761,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1780,22 +1772,19 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1811,7 +1800,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1820,15 +1808,13 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1949,8 +1935,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1963,7 +1948,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1975,8 +1959,7 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2237,8 +2220,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2334,7 +2316,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2398,7 +2379,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2478,7 +2459,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "continuable-cache": {
@@ -2521,7 +2502,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
       "dev": true
     },
     "core-util-is": {
@@ -2547,7 +2528,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2802,7 +2782,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2820,7 +2799,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2829,15 +2807,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2849,7 +2825,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2859,7 +2834,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2869,7 +2843,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2883,7 +2856,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2899,15 +2871,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2919,15 +2889,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2939,22 +2907,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2963,15 +2928,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2981,7 +2944,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3002,15 +2964,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3021,7 +2981,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3037,7 +2996,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3047,7 +3005,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3057,7 +3014,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3068,7 +3024,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3079,7 +3034,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3092,7 +3046,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3104,7 +3057,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3132,7 +3084,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3146,22 +3097,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3174,7 +3122,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3185,7 +3132,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3198,7 +3144,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3213,22 +3158,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3241,7 +3183,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3252,7 +3193,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3265,7 +3205,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3279,22 +3218,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3307,7 +3243,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3318,7 +3253,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3331,7 +3265,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3347,7 +3280,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3360,8 +3292,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3494,7 +3425,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3560,7 +3491,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3584,7 +3514,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3593,15 +3522,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3613,7 +3540,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3623,7 +3549,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3633,7 +3558,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3647,7 +3571,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3663,15 +3586,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3683,15 +3604,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3703,22 +3622,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3727,15 +3643,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3745,7 +3659,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3766,15 +3679,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3785,7 +3696,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3801,7 +3711,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3811,7 +3720,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3821,7 +3729,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3832,7 +3739,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3843,7 +3749,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3856,7 +3761,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3868,7 +3772,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3911,7 +3814,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3924,7 +3826,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3933,15 +3834,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3951,7 +3850,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3967,7 +3865,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3979,7 +3876,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3989,8 +3885,7 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4058,7 +3953,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4094,7 +3989,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4258,7 +4153,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4353,7 +4248,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4363,13 +4258,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
       "dev": true
     },
     "espree": {
@@ -4392,7 +4287,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4401,7 +4296,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4461,7 +4356,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
       "dev": true
     },
     "exec-buffer": {
@@ -4676,7 +4571,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -4930,7 +4825,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4978,15 +4872,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5233,8 +5125,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5298,8 +5189,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5320,14 +5210,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5342,20 +5230,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5472,8 +5357,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5485,7 +5369,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5500,7 +5383,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5508,14 +5390,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5534,7 +5414,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5615,8 +5494,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5628,7 +5506,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5714,8 +5591,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5751,7 +5627,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5771,7 +5646,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5815,14 +5689,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5858,7 +5730,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6020,7 +5891,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6165,7 +6036,6 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6189,7 +6059,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6198,22 +6067,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6223,7 +6089,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6239,7 +6104,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6259,8 +6123,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6556,7 +6419,6 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6568,15 +6430,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6592,7 +6452,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6602,7 +6461,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
+      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7210,7 +7069,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7223,15 +7081,13 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7241,7 +7097,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7560,7 +7415,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7711,7 +7566,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -8005,7 +7860,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8072,8 +7927,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8208,8 +8062,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8222,8 +8075,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8289,8 +8141,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8304,7 +8155,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8313,15 +8164,14 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8351,8 +8201,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8363,7 +8212,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8373,8 +8222,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8386,8 +8234,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8405,8 +8252,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8523,7 +8369,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8650,7 +8496,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -8737,7 +8583,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8746,15 +8591,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8770,7 +8613,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9076,8 +8918,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9274,8 +9115,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9316,7 +9156,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9497,7 +9337,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "minimatch": {
@@ -9671,8 +9511,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12722,8 +12561,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13027,7 +12865,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "posix-character-classes": {
@@ -13434,8 +13272,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13518,7 +13355,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
     "qs": {
@@ -13567,7 +13404,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13580,7 +13416,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13590,15 +13425,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13614,7 +13447,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13719,7 +13551,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14217,7 +14049,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sax": {
@@ -14231,7 +14063,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14377,8 +14208,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14406,7 +14236,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
       "dev": true
     },
     "shebang-command": {
@@ -14696,7 +14526,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14883,8 +14713,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14928,7 +14757,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14939,7 +14767,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14948,15 +14775,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14972,7 +14797,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14982,20 +14806,19 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -15022,7 +14845,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15037,7 +14860,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -15054,7 +14877,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15168,7 +14991,6 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15182,15 +15004,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15204,7 +15024,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15213,15 +15032,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15252,7 +15069,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15286,7 +15102,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15295,15 +15110,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15316,8 +15129,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15379,7 +15191,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15395,7 +15206,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15404,15 +15214,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15422,7 +15230,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15438,7 +15245,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15537,7 +15343,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15562,8 +15367,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timsort": {
       "version": "0.3.0",
@@ -15615,7 +15419,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15626,7 +15430,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15636,7 +15439,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15653,8 +15455,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15733,7 +15534,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15783,7 +15583,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15825,7 +15625,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
       "dev": true
     },
     "unc-path-regex": {
@@ -15982,19 +15782,18 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -16011,7 +15810,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16097,8 +15895,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16143,7 +15940,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16153,22 +15949,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16184,7 +15977,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16324,7 +16116,6 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16415,7 +16206,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16438,7 +16228,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
@@ -16519,7 +16309,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index aed4bad87a..a35a404c24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -22,7 +22,7 @@ function startUpVideosDashboardController($scope, dashboardResource) {
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController);
 
 
-function startUpDynamicContentController($timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
+function startUpDynamicContentController($q, $timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
     var vm = this;
     var evts = [];
 

From 6e2c143d0060b1f56dc13e674c8075762a1512c1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 18 Mar 2019 12:16:20 +0100
Subject: [PATCH 035/130] Improve the filtering in the datatype picker

---
 .../datatypepicker.controller.js              | 23 +++++++++++++++----
 .../datatypepicker/datatypepicker.html        | 18 +++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
index 9836b72468..c86f55b255 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
@@ -10,7 +10,7 @@
 (function() {
     "use strict";
 
-    function DataTypePicker($scope, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService, editorService) {
+    function DataTypePicker($scope, $filter, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService, editorService) {
 
         var vm = this;
 
@@ -119,13 +119,28 @@
             $scope.model.itemDetails = null;
 
             if (vm.searchTerm) {
-                vm.showFilterResult = true;
                 vm.showTabs = false;
+
+                var regex = new RegExp(vm.searchTerm, "i");
+                vm.filterResult = {
+                    userConfigured: filterCollection(vm.userConfigured, regex),
+                    typesAndEditors: filterCollection(vm.typesAndEditors, regex)
+                };
             } else {
-                vm.showFilterResult = false;
+                vm.filterResult = null;
                 vm.showTabs = true;
             }
+        }
 
+        function filterCollection(collection, regex) {
+            return _.map(_.keys(collection), function (key) {
+                return {
+                    group: key,
+                    dataTypes: $filter('filter')(collection[key], function (dataType) {
+                        return regex.test(dataType.name) || regex.test(dataType.alias);
+                    })
+                }
+            });
         }
 
         function showDetailsOverlay(property) {
@@ -201,4 +216,4 @@
 
     angular.module("umbraco").controller("Umbraco.Editors.DataTypePickerController", DataTypePicker);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index f3f991c63e..43933f8051 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -79,13 +79,13 @@
                         </umb-tab-content>
                     </div>
                     <!-- FILTER RESULTS -->
-                    <div ng-if="vm.showFilterResult">
+                    <div ng-if="vm.filterResult">
                         <h5 class="-border-bottom -black"><localize key="contentTypeEditor_reuse"></localize></h5>
-                        <div ng-repeat="(key,value) in vm.userConfigured">
-                            <div ng-if="(value | filter:vm.searchTerm).length > 0">
-                                <h5>{{key}}</h5>
+                        <div ng-repeat="result in vm.filterResult.userConfigured">
+                            <div ng-if="result.dataTypes.length > 0">
+                                <h5>{{result.group}}</h5>
                                 <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                    <li ng-repeat="dataType in value | orderBy:'name' | filter: vm.searchTerm"
+                                    <li ng-repeat="dataType in result.dataTypes | orderBy:'name'"
                                         ng-mouseover="vm.showDetailsOverlay(dataType)"
                                         ng-click="vm.pickDataType(dataType)"
                                         class="-four-in-row">
@@ -101,11 +101,11 @@
                             </div>
                         </div>
                         <h5 class="-border-bottom -black"><localize key="contentTypeEditor_availableEditors"></localize></h5>
-                        <div ng-repeat="(key,value) in vm.typesAndEditors">
-                            <div ng-if="(value | filter:vm.searchTerm).length > 0">
-                                <h5>{{key}}</h5>
+                        <div ng-repeat="result in vm.filterResult.typesAndEditors">
+                            <div ng-if="result.dataTypes.length > 0">
+                                <h5>{{result.group}}</h5>
                                 <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                    <li ng-repeat="systemDataType in value | orderBy:'name' | filter: vm.searchTerm"
+                                    <li ng-repeat="systemDataType in result.dataTypes | orderBy:'name'"
                                         ng-mouseover="vm.showDetailsOverlay(systemDataType)"
                                         ng-click="vm.pickEditor(systemDataType)"
                                         class="-four-in-row">

From 919f1396072df7f324f14177fb21052d41002031 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 18 Mar 2019 14:52:50 +0100
Subject: [PATCH 036/130] https://github.com/umbraco/Umbraco-CMS/issues/4967 -
 fix for ordering by IsPublished in list view

---
 .../Repositories/Implement/ContentRepositoryBase.cs    |  1 -
 .../Repositories/Implement/DocumentRepository.cs       | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 821f0941fc..6b8e6515f5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -292,7 +292,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     if (psql.Arguments[i] is string s && s == "[[[ISOCODE]]]")
                     {
                         psql.Arguments[i] = ordering.Culture;
-                        break;
                     }
                 }
             }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 24b50d294b..fcc8402265 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -982,8 +982,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 // invariant: left join will yield NULL and we must use pcv to determine published
                 // variant: left join may yield NULL or something, and that determines published
 
+
                 var joins = Sql()
-                    .InnerJoin<ContentTypeDto>("ctype").On<ContentDto, ContentTypeDto>((content, contentType) => content.ContentTypeId == contentType.NodeId, aliasRight: "ctype");
+                    .InnerJoin<ContentTypeDto>("ctype").On<ContentDto, ContentTypeDto>((content, contentType) => content.ContentTypeId == contentType.NodeId, aliasRight: "ctype")
+                    // left join on optional culture variation
+                    //the magic "[[[ISOCODE]]]" parameter value will be replaced in ContentRepositoryBase.GetPage() by the actual ISO code
+                    .LeftJoin<ContentVersionCultureVariationDto>(nested =>
+                        nested.InnerJoin<LanguageDto>("langp").On<ContentVersionCultureVariationDto, LanguageDto>((ccv, lang) => ccv.LanguageId == lang.Id && lang.IsoCode == "[[[ISOCODE]]]", "ccvp", "langp"), "ccvp")
+                    .On<ContentVersionDto, ContentVersionCultureVariationDto>((version, ccv) => version.Id == ccv.VersionId, aliasLeft: "pcv", aliasRight: "ccvp");
 
                 sql = InsertJoins(sql, joins);
 
@@ -993,7 +999,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                     // when invariant, ie 'variations' does not have the culture flag (value 1), use the global 'published' flag on pcv.id,
                     // otherwise check if there's a version culture variation for the lang, via ccv.id
-                    ", (CASE WHEN (ctype.variations & 1) = 0 THEN (CASE WHEN pcv.id IS NULL THEN 0 ELSE 1 END) ELSE (CASE WHEN ccv.id IS NULL THEN 0 ELSE 1 END) END) AS ordering "); // trailing space is important!
+                    ", (CASE WHEN (ctype.variations & 1) = 0 THEN (CASE WHEN pcv.id IS NULL THEN 0 ELSE 1 END) ELSE (CASE WHEN ccvp.id IS NULL THEN 0 ELSE 1 END) END) AS ordering "); // trailing space is important!
 
                 sql = Sql(sqlText, sql.Arguments);
 

From 4a26bfe3c3a288fc689d6c5c95475561c1e289b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Mar 2019 15:00:32 +0100
Subject: [PATCH 037/130] clean up imports

---
 .../listview/layouts/grid/grid.listviewlayout.controller.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 9a2ff4975d..292ca3f975 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -9,7 +9,7 @@
 (function () {
     "use strict";
 
-    function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper, editorService) {
+    function ListViewGridLayoutController($scope, mediaHelper, $location, listViewHelper, mediaTypeHelper) {
 
         var vm = this;
         var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;

From 873d230e0e9111b57ea2f2b6c18b06664f4cf647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Mar 2019 16:19:02 +0100
Subject: [PATCH 038/130] improve hover state for open user

---
 .../src/less/components/users/umb-user-cards.less          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index e24f68078b..3508750232 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -50,8 +50,13 @@
 
 .umb-user-card__goToUser {
     &:hover {
+        text-decoration: none;
         .umb-user-card__name {
-        text-decoration: underline;
+            text-decoration: underline;
+            color: @ui-option-type-hover;
+        }
+        .umb-avatar {
+            border: 1px solid @ui-option-type-hover;
         }
     }
 }

From c6dfc28f0388d15502a75be0a33f64b717e0db8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Mar 2019 16:34:41 +0100
Subject: [PATCH 039/130] make open user able to open in a new tab + only use
 pointer is selectable + improved hover state for open user

---
 .../less/components/users/umb-user-cards.less |  6 ++-
 .../users/views/users/users.controller.js     | 38 ++++++++++++++----
 .../src/views/users/views/users/users.html    | 40 +++++++++++--------
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index 3508750232..7fb4f543a7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -17,6 +17,10 @@
     outline: none;
     text-decoration: none !important;
 }
+
+.umb-user-card.-selectable {
+    cursor: pointer;
+}
 .umb-user-card.-selected {
     &::before {
         content: "";
@@ -31,7 +35,6 @@
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
         pointer-events: none;
     }
-    
 }
 
 .umb-user-card__content {
@@ -44,7 +47,6 @@
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    cursor: pointer;
     max-width: 100%;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 941d72b8c9..65520ef638 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -96,6 +96,7 @@
         vm.toggleFilter = toggleFilter;
         vm.setUsersViewState = setUsersViewState;
         vm.selectLayout = selectLayout;
+        vm.isSelectable = isSelectable;
         vm.selectUser = selectUser;
         vm.clearSelection = clearSelection;
         vm.clickUser = clickUser;
@@ -200,10 +201,14 @@
             selectedLayout.active = true;
             vm.activeLayout = selectedLayout;
         }
-
+        
+        function isSelectable(user) {
+            return !user.isCurrentUser;
+        }
+        
         function selectUser(user) {
             
-            if (user.isCurrentUser) {
+            if (!isSelectable(user)) {
                 return;
             }
             
@@ -227,10 +232,14 @@
             vm.selection = [];
         }
 
-        function clickUser(user) {
-            goToUser(user.id);
+        function clickUser(user, $event) {
+            if (!($event.metaKey || $event.ctrlKey)) {
+                goToUser(user);
+                $event.preventDefault();
+            }
+            $event.stopPropagation();
         }
-
+        
         function disableUsers() {
             vm.disableUserButtonState = "busy";
             usersResource.disableUsers(vm.selection).then(function (data) {
@@ -551,8 +560,12 @@
             vm.page.copyPasswordButtonState = "init";
         }
 
-        function goToUser(userId) {
-            $location.path('users/users/user/' + userId).search("create", null).search("invite", null);
+        function goToUser(user) {
+            $location.path('users/users/user/' + user.id).search("create", null).search("invite", null);
+        }
+        
+        function getEditPath(user) {
+            return '/users/users/user/' + user.id;
         }
 
         // helpers
@@ -569,8 +582,9 @@
                 vm.usersOptions.pageSize = data.pageSize;
                 vm.usersOptions.totalItems = data.totalItems;
                 vm.usersOptions.totalPages = data.totalPages;
-
+                
                 formatDates(vm.users);
+                addEditPaths(vm.users);
                 setUserDisplayState(vm.users);
                 vm.userStatesFilter = usersHelper.getUserStatesFilter(data.userStates);
 
@@ -610,6 +624,14 @@
                 }
             });
         }
+        
+        function addEditPaths(users) {
+            angular.forEach(users, function (user) {
+                if (!user.editPath) {
+                    user.editPath = getEditPath(user);
+                }
+            });
+        }
 
         function setBulkActions(users) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index cefc3c5c86..483d4e2bc4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -191,18 +191,18 @@
 
         <!-- Layout: Cards -->
         <div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
-            <div class="umb-user-card" ng-class="{'-selected': user.selected}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user)">
+            <div class="umb-user-card" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user)">
                 <div class="umb-user-card__content">
-                    <div class="umb-user-card__goToUser" ng-click="vm.clickUser(user)">
-                        <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
-                            {{ user.userDisplayState.name }}
-                        </umb-badge>
+                    <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
+                        {{ user.userDisplayState.name }}
+                    </umb-badge>
+                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
                         <div class="umb-user-card__avatar">
                             <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
                             </umb-avatar>
                         </div>
                         <div class="umb-user-card__name">{{user.name}}</div>
-                    </div>
+                    </a>
                     <div class="umb-user-card__group">
                         <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
                     </div>
@@ -257,16 +257,22 @@
                                 </umb-checkmark>
                             </div>
                         </td>
-                        <td scope="row" ng-click="vm.clickUser(user)">
-                            <umb-avatar
-                                size="xs"
-                                color="secondary"
-                                name="{{user.name}}"
-                                img-src="{{user.avatars[0]}}"
-                                img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
-                            </umb-avatar>
+                        <td scope="row">
+                            <a ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
+                                <umb-avatar
+                                    size="xs"
+                                    color="secondary"
+                                    name="{{user.name}}"
+                                    img-src="{{user.avatars[0]}}"
+                                    img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
+                                </umb-avatar>
+                            </a>
+                        </td>
+                        <td class="bold">
+                            <a ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
+                                {{user.name}}
+                            </a>
                         </td>
-                        <td class="bold" ng-click="vm.clickUser(user)">{{user.name}}</td>
                         <td><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></td>
                         <td>{{ user.formattedLastLogin }}</td>
                         <td style="text-transform: capitalize;">
@@ -490,7 +496,7 @@
                             type="button"
                             button-style="action"
                             label-key="user_goToProfile"
-                            action="vm.goToUser(vm.newUser.id);"
+                            action="vm.goToUser(vm.newUser);"
                             size="m">
                         </umb-button>
                     </div>
@@ -540,7 +546,7 @@
                         type="button"
                         button-style="action"
                         label-key="user_goToProfile"
-                        action="vm.goToUser(vm.newUser.id);"
+                        action="vm.goToUser(vm.newUser);"
                         size="m">
                     </umb-button>
                 </div>

From 970f336a5d848f63617b8cce3f54e87075562d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Mar 2019 16:41:34 +0100
Subject: [PATCH 040/130] clean up imports

---
 .../src/views/users/views/users/users.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 65520ef638..1ddb27991d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UsersController($scope, $timeout, $location, $routeParams, usersResource, userGroupsResource, userService, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService, dateHelper, editorService) {
+    function UsersController($scope, $timeout, $location, $routeParams, usersResource, userGroupsResource, userService, localizationService, usersHelper, formHelper, dateHelper, editorService) {
 
         var vm = this;
         var localizeSaving = localizationService.localize("general_saving");

From 7f334540029f76761525b494c7d2ac40c9c6b98b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 18 Mar 2019 17:51:04 +0100
Subject: [PATCH 041/130] Better ServerMessenger configuration

---
 src/Umbraco.Core/CompositionExtensions.cs     | 22 +++++
 .../BatchedDatabaseServerMessenger.cs         |  5 +-
 ...aseServerRegistrarAndMessengerComponent.cs | 80 ++++++++-----------
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index e1c7ad4467..828a577c34 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -203,6 +203,28 @@ namespace Umbraco.Core
             composition.RegisterUnique(_ => registrar);
         }
 
+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="factory">A function creating the options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, Func<IFactory, DatabaseServerMessengerOptions> factory)
+        {
+            composition.RegisterUnique(factory);
+        }
+
+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="options">Options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, DatabaseServerMessengerOptions options)
+        {
+            composition.RegisterUnique(_ => options);
+        }
+
         /// <summary>
         /// Sets the short string helper.
         /// </summary>
diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
index 76d7565862..818e8ecf77 100644
--- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
@@ -27,9 +27,8 @@ namespace Umbraco.Web
         private readonly IUmbracoDatabaseFactory _databaseFactory;
 
         public BatchedDatabaseServerMessenger(
-            IRuntimeState runtime, IUmbracoDatabaseFactory databaseFactory, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, IGlobalSettings globalSettings,
-            bool enableDistCalls, DatabaseServerMessengerOptions options)
-            : base(runtime, scopeProvider, sqlContext, proflog, globalSettings, enableDistCalls, options)
+            IRuntimeState runtime, IUmbracoDatabaseFactory databaseFactory, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, IGlobalSettings globalSettings, DatabaseServerMessengerOptions options)
+            : base(runtime, scopeProvider, sqlContext, proflog, globalSettings, true, options)
         {
             _databaseFactory = databaseFactory;
         }
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 086aa9b197..a68e137665 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -38,54 +38,44 @@ namespace Umbraco.Web.Compose
 
     public sealed class DatabaseServerRegistrarAndMessengerComposer : ComponentComposer<DatabaseServerRegistrarAndMessengerComponent>, ICoreComposer
     {
+        public static DatabaseServerMessengerOptions GetDefaultOptions(IFactory factory)
+        {
+            var logger = factory.GetInstance<ILogger>();
+            var indexRebuilder = factory.GetInstance<IndexRebuilder>();
+
+            return new DatabaseServerMessengerOptions
+            {
+                //These callbacks will be executed if the server has not been synced
+                // (i.e. it is a new server or the lastsynced.txt file has been removed)
+                InitializingCallbacks = new Action[]
+                {
+                    //rebuild the xml cache file if the server is not synced
+                    () =>
+                    {
+                        // rebuild the published snapshot caches entirely, if the server is not synced
+                        // this is equivalent to DistributedCache RefreshAll... but local only
+                        // (we really should have a way to reuse RefreshAll... locally)
+                        // note: refresh all content & media caches does refresh content types too
+                        var svc = Current.PublishedSnapshotService;
+                        svc.Notify(new[] { new DomainCacheRefresher.JsonPayload(0, DomainChangeTypes.RefreshAll) });
+                        svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _, out _);
+                        svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _);
+                    },
+
+                    //rebuild indexes if the server is not synced
+                    // NOTE: This will rebuild ALL indexes including the members, if developers want to target specific
+                    // indexes then they can adjust this logic themselves.
+                    () => { ExamineComponent.RebuildIndexes(indexRebuilder, logger, false, 5000); }
+                }
+            };
+        }
+
         public override void Compose(Composition composition)
         {
             base.Compose(composition);
 
-            composition.SetServerMessenger(factory =>
-            {
-                var runtime = factory.GetInstance<IRuntimeState>();
-                var databaseFactory = factory.GetInstance<IUmbracoDatabaseFactory>();
-                var globalSettings = factory.GetInstance<IGlobalSettings>();
-                var proflog = factory.GetInstance<IProfilingLogger>();
-                var scopeProvider = factory.GetInstance<IScopeProvider>();
-                var sqlContext = factory.GetInstance<ISqlContext>();
-                var logger = factory.GetInstance<ILogger>();
-                var indexRebuilder = factory.GetInstance<IndexRebuilder>();
-
-                return new BatchedDatabaseServerMessenger(
-                    runtime, databaseFactory, scopeProvider, sqlContext, proflog, globalSettings,
-                    true,
-                    //Default options for web including the required callbacks to build caches
-                    new DatabaseServerMessengerOptions
-                    {
-                        //These callbacks will be executed if the server has not been synced
-                        // (i.e. it is a new server or the lastsynced.txt file has been removed)
-                        InitializingCallbacks = new Action[]
-                        {
-                            //rebuild the xml cache file if the server is not synced
-                            () =>
-                            {
-                                // rebuild the published snapshot caches entirely, if the server is not synced
-                                // this is equivalent to DistributedCache RefreshAll... but local only
-                                // (we really should have a way to reuse RefreshAll... locally)
-                                // note: refresh all content & media caches does refresh content types too
-                                var svc = Current.PublishedSnapshotService;
-                                svc.Notify(new[] { new DomainCacheRefresher.JsonPayload(0, DomainChangeTypes.RefreshAll) });
-                                svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _, out _);
-                                svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _);
-                            },
-
-                            //rebuild indexes if the server is not synced
-                            // NOTE: This will rebuild ALL indexes including the members, if developers want to target specific
-                            // indexes then they can adjust this logic themselves.
-                            () =>
-                            {
-                                ExamineComponent.RebuildIndexes(indexRebuilder, logger, false, 5000);
-                            }
-                        }
-                    });
-            });
+            composition.SetDatabaseServerMessengerOptions(GetDefaultOptions);
+            composition.SetServerMessenger<BatchedDatabaseServerMessenger>();
         }
     }
 
@@ -128,7 +118,7 @@ namespace Umbraco.Web.Compose
         }
 
         public void Initialize()
-        { 
+        {
             //We will start the whole process when a successful request is made
             if (_registrar != null || _messenger != null)
                 UmbracoModule.RouteAttempt += RegisterBackgroundTasksOnce;

From 137c08eaf30e0099b36072753e6f67bb64783e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 09:06:05 +0100
Subject: [PATCH 042/130] Parse $event argument

---
 .../src/views/users/views/users/users.html                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 483d4e2bc4..4131076118 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -196,7 +196,7 @@
                     <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
                         {{ user.userDisplayState.name }}
                     </umb-badge>
-                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
+                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
                         <div class="umb-user-card__avatar">
                             <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
                             </umb-avatar>
@@ -258,7 +258,7 @@
                             </div>
                         </td>
                         <td scope="row">
-                            <a ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
+                            <a ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
                                 <umb-avatar
                                     size="xs"
                                     color="secondary"
@@ -269,7 +269,7 @@
                             </a>
                         </td>
                         <td class="bold">
-                            <a ng-click="vm.clickUser(user)" ng-href="{{'#' + user.editPath}}">
+                            <a ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
                                 {{user.name}}
                             </a>
                         </td>

From 44cb5fd96b8b323164778be1c94570f59df85a40 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Mar 2019 09:24:41 +0100
Subject: [PATCH 043/130] Apparently the highest minClientVersion allowed is
 4.1.0 for now - see
 https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery/GalleryConstants.cs#L36

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec  | 2 +-
 build/NuSpecs/UmbracoCms.nuspec      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index b257f8dcdd..11b1870b90 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 79113a7c94..e81c199288 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 8ec1484452..c93a82c691 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>

From 542eb2ab1d9a82c535a2a87426e7304778f8c388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 10:04:13 +0100
Subject: [PATCH 044/130] borrow great stuff from KJAC.

---
 .../less/components/users/umb-user-cards.less |  2 +-
 .../users/views/users/users.controller.js     | 46 +++++++++++--------
 .../src/views/users/views/users/users.html    | 10 ++--
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index 7fb4f543a7..190f977880 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -51,7 +51,7 @@
 }
 
 .umb-user-card__goToUser {
-    &:hover {
+    &:hover, &:focus {
         text-decoration: none;
         .umb-user-card__name {
             text-decoration: underline;
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 1ddb27991d..d19339931a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -231,15 +231,28 @@
             });
             vm.selection = [];
         }
-
-        function clickUser(user, $event) {
-            if (!($event.metaKey || $event.ctrlKey)) {
-                goToUser(user);
-                $event.preventDefault();
-            }
-            $event.stopPropagation();
-        }
         
+        function clickUser(user, $event) {
+            
+            $event.stopPropagation();
+            
+            if ($event) {
+                // targeting a new tab/window?
+                if ($event.ctrlKey || 
+                    $event.shiftKey ||
+                    $event.metaKey || // apple
+                    ($event.button && $event.button === 1) // middle click, >IE9 + everyone else
+                ) {
+                    // yes, let the link open itself
+                    return;
+                }
+            }
+            
+            goToUser(user);
+            $event.preventDefault();
+
+        }
+
         function disableUsers() {
             vm.disableUserButtonState = "busy";
             usersResource.disableUsers(vm.selection).then(function (data) {
@@ -561,11 +574,15 @@
         }
 
         function goToUser(user) {
-            $location.path('users/users/user/' + user.id).search("create", null).search("invite", null);
+            $location.path(pathToUser(user.id).search("create", null).search("invite", null);
         }
         
         function getEditPath(user) {
-            return '/users/users/user/' + user.id;
+            return pathToUser(userId) + "?mculture=" + $location.search().mculture;
+        }
+        
+        function pathToUser(userId) {
+            return "/users/users/user/" + userId;
         }
 
         // helpers
@@ -584,7 +601,6 @@
                 vm.usersOptions.totalPages = data.totalPages;
                 
                 formatDates(vm.users);
-                addEditPaths(vm.users);
                 setUserDisplayState(vm.users);
                 vm.userStatesFilter = usersHelper.getUserStatesFilter(data.userStates);
 
@@ -624,14 +640,6 @@
                 }
             });
         }
-        
-        function addEditPaths(users) {
-            angular.forEach(users, function (user) {
-                if (!user.editPath) {
-                    user.editPath = getEditPath(user);
-                }
-            });
-        }
 
         function setBulkActions(users) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 4131076118..27c8c295ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -191,12 +191,12 @@
 
         <!-- Layout: Cards -->
         <div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
-            <div class="umb-user-card" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user)">
+            <div class="umb-user-card" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user, $event)">
                 <div class="umb-user-card__content">
                     <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
                         {{ user.userDisplayState.name }}
                     </umb-badge>
-                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
+                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                         <div class="umb-user-card__avatar">
                             <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
                             </umb-avatar>
@@ -244,7 +244,7 @@
                 <tbody>
                     <tr ng-repeat="user in vm.users track by user.key"
                         ng-click="vm.selectUser(user, vm.selection, $event)"
-                        ng-class="{'--selected': user.selected}"
+                         ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
                         style="cursor: pointer;"
                         ng-mouseenter="user.hover = true"
                         ng-mouseleave="user.hover = false">
@@ -258,7 +258,7 @@
                             </div>
                         </td>
                         <td scope="row">
-                            <a ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
+                            <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                                 <umb-avatar
                                     size="xs"
                                     color="secondary"
@@ -269,7 +269,7 @@
                             </a>
                         </td>
                         <td class="bold">
-                            <a ng-click="vm.clickUser(user, $event)" ng-href="{{'#' + user.editPath}}">
+                            <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                                 {{user.name}}
                             </a>
                         </td>

From 4b02bf2ddf41e691dff97309ff64076c70afe031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 10:55:36 +0100
Subject: [PATCH 045/130] use umb-table for users table

---
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../less/components/users/umb-user-table.less | 27 ++++++++
 .../src/views/users/views/users/users.html    | 61 +++++++++----------
 3 files changed, 57 insertions(+), 32 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less

diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 88988485fe..8c0df988d1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -167,6 +167,7 @@
 @import "components/umb-property-file-upload.less";
 
 @import "components/users/umb-user-cards.less";
+@import "components/users/umb-user-table.less";
 @import "components/users/umb-user-details.less";
 @import "components/users/umb-user-group-picker-list.less";
 @import "components/users/umb-user-group-preview.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
new file mode 100644
index 0000000000..fcbefa934c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
@@ -0,0 +1,27 @@
+.umb-user-table-col-avatar {
+    flex: 0 0 32px;
+    padding: 15px 0;
+}
+
+.umb-user-table-row {
+    cursor: default;
+}
+
+.umb-user-table-row.-selectable {
+    cursor: pointer;
+}
+.umb-user-table-row.-selected {
+    
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:1;
+        top: 1px;
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        border: 2px solid @ui-selected-border;
+        box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+        pointer-events: none;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 27c8c295ab..2d5c38da0f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -226,38 +226,35 @@
         <!-- Layout: Table -->
         <div ng-if="vm.activeLayout.path === '2'">
 
-            <table class="table table-hover">
-                <thead>
-                    <tr>
-                        <th style="padding-left: 10px; width: 10px;">
+            <div class="umb-table">
+                <div class="umb-table-head">
+                    <div class="umb-table-row">
+                        <div class="umb-table-cell" style="padding-left: 10px; width: 10px;">
                             <a href="" style="text-decoration: none;" ng-click="vm.selectAll()">
                                 <umb-checkmark checked="vm.areAllSelected()" size="xs"></umb-checkmark>
                             </a>
-                        </th>
-                        <th style="width: 70px;"></th>
-                        <th><localize key="general_name">Name</localize></th>
-                        <th><localize key="user_usergroup">User group</localize></th>
-                        <th><localize key="user_lastLogin">Last login</localize></th>
-                        <th><localize key="general_status">Status</localize></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr ng-repeat="user in vm.users track by user.key"
+                        </div>
+                        <div class="umb-table-cell umb-user-table-col-avatar" style="width: 70px;"></div>
+                        <div class="umb-table-cell umb-table__name"><localize key="general_name">Name</localize></div>
+                        <div class="umb-table-cell"><localize key="user_usergroup">User group</localize></div>
+                        <div class="umb-table-cell"><localize key="user_lastLogin">Last login</localize></div>
+                        <div class="umb-table-cell"><localize key="general_status">Status</localize></div>
+                    </div>
+                </div>
+                <div class="umb-table-body">
+                    <div ng-repeat="user in vm.users track by user.key"
                         ng-click="vm.selectUser(user, vm.selection, $event)"
-                         ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
-                        style="cursor: pointer;"
-                        ng-mouseenter="user.hover = true"
-                        ng-mouseleave="user.hover = false">
-                        <td style="padding-left: 10px;">
+                        ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
+                        class="umb-table-row umb-user-table-row">
+                        <div class="umb-table-cell" style="padding-left: 10px;">
                             <div ng-if="!user.isCurrentUser">
                                 <umb-checkmark
-                                    ng-if="vm.selection.length > 0 || user.hover"
                                     checked="user.selected"
                                     size="xs">
                                 </umb-checkmark>
                             </div>
-                        </td>
-                        <td scope="row">
+                        </div>
+                        <div class="umb-table-cell umb-user-table-col-avatar" scope="row">
                             <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                                 <umb-avatar
                                     size="xs"
@@ -267,25 +264,25 @@
                                     img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
                                 </umb-avatar>
                             </a>
-                        </td>
-                        <td class="bold">
+                        </div>
+                        <div class="umb-table-cell umb-table__name">
                             <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                                 {{user.name}}
                             </a>
-                        </td>
-                        <td><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></td>
-                        <td>{{ user.formattedLastLogin }}</td>
-                        <td style="text-transform: capitalize;">
+                        </div>
+                        <div class="umb-table-cell"><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></div>
+                        <div class="umb-table-cell">{{ user.formattedLastLogin }}</div>
+                        <div class="umb-table-cell" style="text-transform: capitalize;">
                             <umb-badge
                                 size="xs"
                                 ng-if="user.userDisplayState.key !== 'Active'"
                                 color="{{user.userDisplayState.color}}">
                                 {{ user.userDisplayState.name }}
                             </umb-badge>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
 
         </div>
 

From 3f10c78bee189d4230d1148b5475176dd5b2d549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 11:04:52 +0100
Subject: [PATCH 046/130] correct js error

---
 .../src/views/users/views/users/users.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index d19339931a..7080303eb0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -574,7 +574,7 @@
         }
 
         function goToUser(user) {
-            $location.path(pathToUser(user.id).search("create", null).search("invite", null);
+            $location.path(pathToUser(user.id).search("create", null).search("invite", null));
         }
         
         function getEditPath(user) {

From 7f45d852ed8dc225062af6f3d7075423725abbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 13:03:02 +0100
Subject: [PATCH 047/130] fix search icon location

---
 src/Umbraco.Web.UI.Client/src/less/listview.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index 8b5a295752..c77e4fd1a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -30,7 +30,7 @@
             position: absolute;
             padding: 5px 8px;
             pointer-events: none;
-            top: 0;
+            top: 2px;
         }
 
         input[type="text"] {

From 9597bde7bb81da4625cbf20c795d0170528dfaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 13:03:59 +0100
Subject: [PATCH 048/130] visual corrections + remember view layout in a cookie

---
 .../less/components/users/umb-user-table.less | 94 ++++++++++++++-----
 .../users/views/users/users.controller.js     | 33 +++++--
 .../src/views/users/views/users/users.html    |  6 +-
 3 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
index fcbefa934c..1fcaf04183 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
@@ -1,27 +1,73 @@
-.umb-user-table-col-avatar {
-    flex: 0 0 32px;
-    padding: 15px 0;
-}
+.umb-user-table {
 
-.umb-user-table-row {
-    cursor: default;
-}
-
-.umb-user-table-row.-selectable {
-    cursor: pointer;
-}
-.umb-user-table-row.-selected {
-    
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:1;
-        top: 1px;
-        left: 1px;
-        right: 1px;
-        bottom: 1px;
-        border: 2px solid @ui-selected-border;
-        box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
-        pointer-events: none;
+    .umb-user-table-col-avatar {
+        flex: 0 0 32px;
+        padding: 15px 0;
     }
+    
+    .umb-table-cell a {
+        &:hover, &:focus {
+            .umb-avatar {
+                border: 1px solid @ui-option-type-hover;
+            }
+        }
+    }
+    
+    .umb-table-body .umb-table-cell.umb-table__name {
+        margin: 0;
+        padding: 0;
+        a {
+            display: flex;
+            padding: 6px 2px;
+            height: 42px;
+            span {
+                margin: auto 14px;
+            }
+        }
+    }
+    .umb-table-cell.umb-table__name a {
+        &:hover, &:focus {
+            text-decoration: underline;
+        }
+    }
+    
+    .umb-user-table-row {
+        cursor: default;
+        .umb-checkmark {
+            visibility: hidden;
+        }
+    }
+
+    .umb-user-table-row.-selectable {
+        cursor: pointer;
+        
+        
+    }
+    
+    .umb-user-table-row.-selectable:hover {
+        .umb-checkmark {
+            visibility: visible;
+        }
+    }
+    
+    .umb-user-table-row.-selected {
+        
+        .umb-checkmark {
+            visibility: visible;
+        }
+        
+        &::before {
+            content: "";
+            position: absolute;
+            z-index:1;
+            top: 1px;
+            left: 1px;
+            right: 1px;
+            bottom: 1px;
+            border: 2px solid @ui-selected-border;
+            box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+            pointer-events: none;
+        }
+    }
+    
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 7080303eb0..f2cf4e6fd8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -1,7 +1,9 @@
 (function () {
     "use strict";
 
-    function UsersController($scope, $timeout, $location, $routeParams, usersResource, userGroupsResource, userService, localizationService, usersHelper, formHelper, dateHelper, editorService) {
+    function UsersController($scope, $timeout, $location, $routeParams, usersResource, 
+        userGroupsResource, userService, localizationService, usersHelper, formHelper, 
+        dateHelper, editorService, $cookies) {
 
         var vm = this;
         var localizeSaving = localizationService.localize("general_saving");
@@ -63,10 +65,18 @@
                 "selected": true
             }
         ];
-
-        // Set card layout to active by default
-        vm.activeLayout = vm.layouts[0];
-
+        
+        var cookieUmbUserLayout = $cookies.get("umbUserLayout");
+        
+        if (cookieUmbUserLayout) {
+            vm.activeLayout = vm.layouts.find(x => x.path === cookieUmbUserLayout);
+        }
+        if (vm.activeLayout === undefined) {
+            // Set card layout to active by default
+            vm.activeLayout = vm.layouts[0];
+        }
+        
+        
         // Don't show the invite button if no email is configured
         if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
             vm.defaultButton = {
@@ -100,6 +110,7 @@
         vm.selectUser = selectUser;
         vm.clearSelection = clearSelection;
         vm.clickUser = clickUser;
+        vm.getEditPath = getEditPath;
         vm.disableUsers = disableUsers;
         vm.enableUsers = enableUsers;
         vm.unlockUsers = unlockUsers;
@@ -200,6 +211,10 @@
             });
             selectedLayout.active = true;
             vm.activeLayout = selectedLayout;
+            
+            var expireDate = new Date();
+            expireDate.setDate(expireDate.getDate() + 365);
+            $cookies.put("umbUserLayout", selectedLayout.path, {path: "/", expires: expireDate});
         }
         
         function isSelectable(user) {
@@ -574,15 +589,15 @@
         }
 
         function goToUser(user) {
-            $location.path(pathToUser(user.id).search("create", null).search("invite", null));
+            $location.path(pathToUser(user)).search("create", null).search("invite", null);
         }
         
         function getEditPath(user) {
-            return pathToUser(userId) + "?mculture=" + $location.search().mculture;
+            return pathToUser(user) + "?mculture=" + $location.search().mculture;
         }
         
-        function pathToUser(userId) {
-            return "/users/users/user/" + userId;
+        function pathToUser(user) {
+            return "/users/users/user/" + user.id;
         }
 
         // helpers
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 2d5c38da0f..26bc478b08 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -226,7 +226,7 @@
         <!-- Layout: Table -->
         <div ng-if="vm.activeLayout.path === '2'">
 
-            <div class="umb-table">
+            <div class="umb-table umb-user-table">
                 <div class="umb-table-head">
                     <div class="umb-table-row">
                         <div class="umb-table-cell" style="padding-left: 10px; width: 10px;">
@@ -267,7 +267,9 @@
                         </div>
                         <div class="umb-table-cell umb-table__name">
                             <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
-                                {{user.name}}
+                                <span>
+                                    {{user.name}}
+                                </span>
                             </a>
                         </div>
                         <div class="umb-table-cell"><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></div>

From e73029cf4fb486318dc0b6510cb2cc2115298137 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 19 Mar 2019 13:08:08 +0100
Subject: [PATCH 049/130] Rename siblings to ParentChildren (Because the actual
 returned list contains the content node self)

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index dbd5008b74..8af2a933f2 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1120,15 +1120,15 @@ namespace Umbraco.Web
 
         #endregion
 
-        #region Axes: siblings
+        #region Axes: Parent Children (siblings including self)
 
         /// <summary>
-        /// Gets the siblings of the content.
+        /// Gets the children of the parent of the content.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
-        /// <returns>The siblings of the content.</returns>
-        public static IEnumerable<IPublishedContent> Siblings(this IPublishedContent content, string culture = null)
+        /// <returns>The children of the parent of the content.</returns>
+        public static IEnumerable<IPublishedContent> ParentChildren(this IPublishedContent content, string culture = null)
         {
             return content.Parent != null
                 ? content.Parent.Children(culture)
@@ -1136,13 +1136,13 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the siblings of the content, of a given content type.
+        /// Gets the children of the parent of the content, of a given content type.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
         /// <param name="contentTypeAlias">The content type alias.</param>
-        /// <returns>The siblings of the content, of the given content type.</returns>
-        public static IEnumerable<IPublishedContent> SiblingsOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
+        /// <returns>The children of the parent of the content, of the given content type.</returns>
+        public static IEnumerable<IPublishedContent> ParentChildrenOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
         {
             return content.Parent != null
                 ? content.Parent.ChildrenOfType(contentTypeAlias, culture)
@@ -1150,13 +1150,13 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the siblings of the content, of a given content type.
+        /// Gets the children of the parent of the content, of a given content type.
         /// </summary>
         /// <typeparam name="T">The content type.</typeparam>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
-        /// <returns>The siblings of the content, of the given content type.</returns>
-        public static IEnumerable<T> Siblings<T>(this IPublishedContent content, string culture = null)
+        /// <returns>The children of the parent of the content, of the given content type.</returns>
+        public static IEnumerable<T> ParentChildren<T>(this IPublishedContent content, string culture = null)
             where T : class, IPublishedContent
         {
             return content.Parent != null

From 532f69e9b7dbeed009b02a5898a783e46a4e75d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 13:53:13 +0100
Subject: [PATCH 050/130] Show checkmark when list has selection

---
 .../src/less/components/users/umb-user-table.less         | 8 ++++++++
 .../src/views/users/views/users/users.html                | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
index 1fcaf04183..d8813e3815 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
@@ -44,6 +44,14 @@
         
     }
     
+    &.-has-selection {
+        .umb-user-table-row.-selectable {
+            .umb-checkmark {
+                visibility: visible;
+            }
+        }
+    }
+    
     .umb-user-table-row.-selectable:hover {
         .umb-checkmark {
             visibility: visible;
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 26bc478b08..7fb036a57a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -226,7 +226,7 @@
         <!-- Layout: Table -->
         <div ng-if="vm.activeLayout.path === '2'">
 
-            <div class="umb-table umb-user-table">
+            <div class="umb-table umb-user-table" ng-class="{'-has-selection': vm.selection.length > 0}">
                 <div class="umb-table-head">
                     <div class="umb-table-row">
                         <div class="umb-table-cell" style="padding-left: 10px; width: 10px;">

From 3a0dd2399a97341af7c75c2cfa1f31358f0a8df1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 19 Mar 2019 14:24:32 +0100
Subject: [PATCH 051/130] V8: Make "Open in split view" look better in narrow
 viewports (#4619)

* Make "Open in split view" look better in narrow viewports
* Add white background to inactive split view button
* Better support for long culture names
---
 .../src/less/components/editor.less                | 14 ++++++++++----
 .../editor/umb-editor-content-header.html          |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 0770a895c0..28d56058d2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -195,6 +195,7 @@ a.umb-variant-switcher__toggle {
     justify-content: space-between;
 	align-items: center;
 	border-bottom: 1px solid @gray-9;
+    position: relative;
     &:hover .umb-variant-switcher__name-wrapper {
         
     }
@@ -246,10 +247,15 @@ a.umb-variant-switcher__toggle {
 }
 
 .umb-variant-switcher__split-view {
-	font-size: 13px;
-	display: none;
-	padding: 16px 20px;
-    
+    font-size: 13px;
+    display: none;
+    padding: 16px 20px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-color: @white;
+
     &:hover {
         background-color: @ui-option-hover;
         color: @ui-option-type-hover;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 227a08c54f..d3bf14b58c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -38,7 +38,7 @@
                         <span>{{vm.currentVariant.language.name}}</span>
                     </span>
 
-                    <umb-dropdown ng-if="vm.dropdownOpen" style="width: 100%; max-height: 250px; overflow-y: scroll; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
+                    <umb-dropdown ng-if="vm.dropdownOpen" style="min-width: 100%; max-height: 250px; overflow-y: auto; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                         <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active, 'umb-variant-switcher_item--not-allowed': variantIsOpen(variant.language.culture)}" ng-repeat="variant in content.variants">
                             <a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
                                 <span class="umb-variant-switcher__name" ng-class="{'bold': variant.language.isDefault}">{{variant.language.name}}</span>

From d637a7951b968c651f189d128117c352687e889a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 19 Mar 2019 14:50:00 +0100
Subject: [PATCH 052/130] V8: Remember choice of layout in Users section
 (#4779)

* Support arbitrary identifiers in "last used listview layout"
* Save and use last selected view layout for the users section
---
 .../common/services/listviewhelper.service.js | 28 +++++++++-------
 .../users/views/users/users.controller.js     | 32 ++++++-------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 6862b11565..6304f4b8a0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -59,11 +59,11 @@
         * Method for internal use, based on the collection of layouts passed, the method selects either
         * any previous layout from local storage, or picks the first allowed layout
         *
-        * @param {Number} nodeId The id of the current node displayed in the content editor
+        * @param {Any} id The identifier of the current node or application displayed in the content editor
         * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
         */
 
-        function getLayout(nodeId, availableLayouts) {
+        function getLayout(id, availableLayouts) {
 
             var storedLayouts = [];
 
@@ -74,8 +74,8 @@
             if (storedLayouts && storedLayouts.length > 0) {
                 for (var i = 0; storedLayouts.length > i; i++) {
                     var layout = storedLayouts[i];
-                    if (layout.nodeId === nodeId) {
-                        return setLayout(nodeId, layout, availableLayouts);
+                    if (isMatchingLayout(id, layout)) {
+                        return setLayout(id, layout, availableLayouts);
                     }
                 }
 
@@ -93,12 +93,12 @@
         * @description
         * Changes the current layout used by the listview to the layout passed in. Stores selection in localstorage
         *
-        * @param {Number} nodeID Id of the current node displayed in the content editor
+        * @param {Any} id The identifier of the current node or application displayed in the content editor
         * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
         * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
         */
 
-        function setLayout(nodeId, selectedLayout, availableLayouts) {
+        function setLayout(id, selectedLayout, availableLayouts) {
 
             var activeLayout = {};
             var layoutFound = false;
@@ -118,7 +118,7 @@
                 activeLayout = getFirstAllowedLayout(availableLayouts);
             }
 
-            saveLayoutInLocalStorage(nodeId, activeLayout);
+            saveLayoutInLocalStorage(id, activeLayout);
 
             return activeLayout;
 
@@ -132,11 +132,11 @@
         * @description
         * Stores a given layout as the current default selection in local storage
         *
-        * @param {Number} nodeId Id of the current node displayed in the content editor
+        * @param {Any} id The identifier of the current node or application displayed in the content editor
         * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
         */
 
-        function saveLayoutInLocalStorage(nodeId, selectedLayout) {
+        function saveLayoutInLocalStorage(id, selectedLayout) {
             var layoutFound = false;
             var storedLayouts = [];
 
@@ -147,7 +147,7 @@
             if (storedLayouts.length > 0) {
                 for (var i = 0; storedLayouts.length > i; i++) {
                     var layout = storedLayouts[i];
-                    if (layout.nodeId === nodeId) {
+                    if (isMatchingLayout(id, layout)) {
                         layout.path = selectedLayout.path;
                         layoutFound = true;
                     }
@@ -156,7 +156,7 @@
 
             if (!layoutFound) {
                 var storageObject = {
-                    "nodeId": nodeId,
+                    "id": id,
                     "path": selectedLayout.path
                 };
                 storedLayouts.push(storageObject);
@@ -510,6 +510,12 @@
             };
         }
 
+        
+        function isMatchingLayout(id, layout) {
+            // legacy format uses "nodeId", be sure to look for both
+            return layout.id === id || layout.nodeId === id;
+        }
+
         var service = {
 
           getLayout: getLayout,
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index f2cf4e6fd8..f10dc4e376 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -2,8 +2,9 @@
     "use strict";
 
     function UsersController($scope, $timeout, $location, $routeParams, usersResource, 
-        userGroupsResource, userService, localizationService, usersHelper, formHelper, 
-        dateHelper, editorService, $cookies) {
+        userGroupsResource, userService, localizationService, contentEditingHelper, 
+        usersHelper, formHelper, notificationsService, dateHelper, editorService, 
+        listViewHelper) {
 
         var vm = this;
         var localizeSaving = localizationService.localize("general_saving");
@@ -65,18 +66,10 @@
                 "selected": true
             }
         ];
-        
-        var cookieUmbUserLayout = $cookies.get("umbUserLayout");
-        
-        if (cookieUmbUserLayout) {
-            vm.activeLayout = vm.layouts.find(x => x.path === cookieUmbUserLayout);
-        }
-        if (vm.activeLayout === undefined) {
-            // Set card layout to active by default
-            vm.activeLayout = vm.layouts[0];
-        }
-        
-        
+
+        // Get last selected layout for "users" (defaults to first layout = card layout)
+        vm.activeLayout = listViewHelper.getLayout("users", vm.layouts); 
+
         // Don't show the invite button if no email is configured
         if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
             vm.defaultButton = {
@@ -206,15 +199,8 @@
         }
 
         function selectLayout(selectedLayout) {
-            angular.forEach(vm.layouts, function (layout) {
-                layout.active = false;
-            });
-            selectedLayout.active = true;
-            vm.activeLayout = selectedLayout;
-            
-            var expireDate = new Date();
-            expireDate.setDate(expireDate.getDate() + 365);
-            $cookies.put("umbUserLayout", selectedLayout.path, {path: "/", expires: expireDate});
+            // save the selected layout for "users" so it's applied next time the user visits this section
+            vm.activeLayout = listViewHelper.setLayout("users", selectedLayout, vm.layouts); 
         }
         
         function isSelectable(user) {

From e4c6ef05a9e3e4d6f8b6d55026d3bd5f4654ee7a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 19 Mar 2019 14:59:52 +0100
Subject: [PATCH 053/130] Introduced both Siblings and SiblingsAndSelf

---
 .../PublishedContent/PublishedContentTests.cs | 89 +++++++++++++++++++
 src/Umbraco.Web/PublishedContentExtensions.cs | 65 +++++++++++---
 2 files changed, 144 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index ab576171f4..de641a99a2 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -10,6 +10,7 @@ using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Core.Composing;
 using Moq;
+using Newtonsoft.Json;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
@@ -32,6 +33,8 @@ namespace Umbraco.Tests.PublishedContent
         protected override void Compose()
         {
             base.Compose();
+            _publishedSnapshotAccessorMock = new Mock<IPublishedSnapshotAccessor>();
+            Composition.RegisterUnique<IPublishedSnapshotAccessor>(_publishedSnapshotAccessorMock.Object);
 
             Composition.RegisterUnique<IPublishedModelFactory>(f => new PublishedModelFactory(f.GetInstance<TypeLoader>().GetTypes<PublishedContentModel>()));
             Composition.RegisterUnique<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
@@ -87,6 +90,7 @@ namespace Umbraco.Tests.PublishedContent
         }
 
         private readonly Guid _node1173Guid = Guid.NewGuid();
+        private Mock<IPublishedSnapshotAccessor> _publishedSnapshotAccessorMock;
 
         protected override string GetXmlContent(int templateId)
         {
@@ -792,6 +796,91 @@ namespace Umbraco.Tests.PublishedContent
             Assert.IsTrue(customDoc3.IsDescendantOrSelf(customDoc3));
         }
 
+        [Test]
+        public void SiblingsAndSelf()
+        {
+            // Structure:
+            // - Root : 1046 (no parent)
+            // -- Level1.1: 1173 (parent 1046)
+            // --- Level1.1.1: 1174 (parent 1173)
+            // --- Level1.1.2: 117 (parent 1173)
+            // --- Level1.1.3: 1177 (parent 1173)
+            // --- Level1.1.4: 1178 (parent 1173)
+            // --- Level1.1.5: 1176 (parent 1173)
+            // -- Level1.2: 1175 (parent 1046)
+            // -- Level1.3: 4444 (parent 1046)
+            var root = GetNode(1046);
+            var level1_1 = GetNode(1173);
+            var level1_1_1 = GetNode(1174);
+            var level1_1_2 = GetNode(117);
+            var level1_1_3 = GetNode(1177);
+            var level1_1_4 = GetNode(1178);
+            var level1_1_5 = GetNode(1176);
+            var level1_2 = GetNode(1175);
+            var level1_3 = GetNode(4444);
+
+            _publishedSnapshotAccessorMock.Setup(x => x.PublishedSnapshot.Content.GetAtRoot()).Returns(new []{root});
+
+            CollectionAssertAreEqual(new []{root}, root.SiblingsAndSelf());
+
+            CollectionAssertAreEqual( new []{level1_1, level1_2, level1_3}, level1_1.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1, level1_2, level1_3}, level1_2.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1, level1_2, level1_3}, level1_3.SiblingsAndSelf());
+
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_1.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_2.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_3.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_4.SiblingsAndSelf());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_5.SiblingsAndSelf());
+
+        }
+
+         [Test]
+        public void Siblings()
+        {
+            // Structure:
+            // - Root : 1046 (no parent)
+            // -- Level1.1: 1173 (parent 1046)
+            // --- Level1.1.1: 1174 (parent 1173)
+            // --- Level1.1.2: 117 (parent 1173)
+            // --- Level1.1.3: 1177 (parent 1173)
+            // --- Level1.1.4: 1178 (parent 1173)
+            // --- Level1.1.5: 1176 (parent 1173)
+            // -- Level1.2: 1175 (parent 1046)
+            // -- Level1.3: 4444 (parent 1046)
+            var root = GetNode(1046);
+            var level1_1 = GetNode(1173);
+            var level1_1_1 = GetNode(1174);
+            var level1_1_2 = GetNode(117);
+            var level1_1_3 = GetNode(1177);
+            var level1_1_4 = GetNode(1178);
+            var level1_1_5 = GetNode(1176);
+            var level1_2 = GetNode(1175);
+            var level1_3 = GetNode(4444);
+
+            _publishedSnapshotAccessorMock.Setup(x => x.PublishedSnapshot.Content.GetAtRoot()).Returns(new []{root});
+
+            CollectionAssertAreEqual(new IPublishedContent[0], root.Siblings());
+
+            CollectionAssertAreEqual( new []{level1_2, level1_3}, level1_1.Siblings());
+            CollectionAssertAreEqual( new []{level1_1,  level1_3}, level1_2.Siblings());
+            CollectionAssertAreEqual( new []{level1_1, level1_2}, level1_3.Siblings());
+
+            CollectionAssertAreEqual( new []{ level1_1_2, level1_1_3, level1_1_4, level1_1_5}, level1_1_1.Siblings());
+            CollectionAssertAreEqual( new []{level1_1_1,  level1_1_3, level1_1_4, level1_1_5}, level1_1_2.Siblings());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2,  level1_1_4, level1_1_5}, level1_1_3.Siblings());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3,  level1_1_5}, level1_1_4.Siblings());
+            CollectionAssertAreEqual( new []{level1_1_1, level1_1_2, level1_1_3, level1_1_4}, level1_1_5.Siblings());
+
+        }
+
+        private void CollectionAssertAreEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual)
+        where T: IPublishedContent
+        {
+            var e = expected.Select(x => x.Id);
+            var a = actual.Select(x => x.Id);
+            CollectionAssert.AreEquivalent(e, a, $"\nExpected:\n{string.Join(", ", e)}\n\nActual:\n{string.Join(", ", a)}");
+        }
 
         [Test]
         public void FragmentProperty()
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 8af2a933f2..bba58dfae5 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1120,15 +1120,60 @@ namespace Umbraco.Web
 
         #endregion
 
-        #region Axes: Parent Children (siblings including self)
+        #region Axes: Siblings
 
         /// <summary>
-        /// Gets the children of the parent of the content.
+        /// Gets the siblings of the content.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
-        /// <returns>The children of the parent of the content.</returns>
-        public static IEnumerable<IPublishedContent> ParentChildren(this IPublishedContent content, string culture = null)
+        /// <returns>The siblings of the content.</returns>
+        /// <remarks>
+        ///   <para>Note that in V7 this method also return the content node self.</para>
+        /// </remarks>
+        public static IEnumerable<IPublishedContent> Siblings(this IPublishedContent content, string culture = null)
+        {
+            return SiblingsAndSelf(content, culture).Where(x => x.Id != content.Id);
+        }
+
+        /// <summary>
+        /// Gets the siblings of the content, of a given content type.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <param name="contentTypeAlias">The content type alias.</param>
+        /// <returns>The siblings of the content, of the given content type.</returns>
+        /// <remarks>
+        ///   <para>Note that in V7 this method also return the content node self.</para>
+        /// </remarks>
+        public static IEnumerable<IPublishedContent> SiblingsOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
+        {
+            return SiblingsAndSelfOfType(content, contentTypeAlias, culture).Where(x => x.Id != content.Id);
+        }
+
+        /// <summary>
+        /// Gets the siblings of the content, of a given content type.
+        /// </summary>
+        /// <typeparam name="T">The content type.</typeparam>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <returns>The siblings of the content, of the given content type.</returns>
+        /// <remarks>
+        ///   <para>Note that in V7 this method also return the content node self.</para>
+        /// </remarks>
+        public static IEnumerable<IPublishedContent> Siblings<T>(this IPublishedContent content, string culture = null)
+            where T : class, IPublishedContent
+        {
+            return SiblingsAndSelf<T>(content, culture).Where(x => x.Id != content.Id);
+        }
+
+        /// <summary>
+        /// Gets the siblings of the content including the node itself to indicate the position.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
+        /// <returns>The siblings of the content including the node itself.</returns>
+        public static IEnumerable<IPublishedContent> SiblingsAndSelf(this IPublishedContent content, string culture = null)
         {
             return content.Parent != null
                 ? content.Parent.Children(culture)
@@ -1136,13 +1181,13 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the children of the parent of the content, of a given content type.
+        /// Gets the siblings of the content including the node itself to indicate the position, of a given content type.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
         /// <param name="contentTypeAlias">The content type alias.</param>
-        /// <returns>The children of the parent of the content, of the given content type.</returns>
-        public static IEnumerable<IPublishedContent> ParentChildrenOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
+        /// <returns>The siblings of the content including the node itself, of the given content type.</returns>
+        public static IEnumerable<IPublishedContent> SiblingsAndSelfOfType(this IPublishedContent content, string contentTypeAlias, string culture = null)
         {
             return content.Parent != null
                 ? content.Parent.ChildrenOfType(contentTypeAlias, culture)
@@ -1150,13 +1195,13 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the children of the parent of the content, of a given content type.
+        /// Gets the siblings of the content including the node itself to indicate the position, of a given content type.
         /// </summary>
         /// <typeparam name="T">The content type.</typeparam>
         /// <param name="content">The content.</param>
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
-        /// <returns>The children of the parent of the content, of the given content type.</returns>
-        public static IEnumerable<T> ParentChildren<T>(this IPublishedContent content, string culture = null)
+        /// <returns>The siblings of the content including the node itself, of the given content type.</returns>
+        public static IEnumerable<T> SiblingsAndSelf<T>(this IPublishedContent content, string culture = null)
             where T : class, IPublishedContent
         {
             return content.Parent != null

From 59a62688c5ad7f303890a0e04275d07c58ac5bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 16:01:36 +0100
Subject: [PATCH 054/130] Make unpublished items in list view show with grey
 text-color on name and icon

---
 .../src/less/components/umb-table.less        | 34 ++++++++++++++++---
 .../less/components/users/umb-user-table.less |  7 ----
 .../src/less/variables.less                   |  6 +++-
 .../src/views/components/umb-table.html       |  5 ++-
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index a0c3f02e40..15cb007a01 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -91,12 +91,17 @@ input.umb-table__input {
 .umb-table-body .umb-table-row {
     color: @gray-5;
     border-top: 1px solid @gray-9;
-    cursor: pointer;
     font-size: 14px;
     position: relative;
     min-height: 52px;
+}
+.umb-table-body .umb-table-row.-selectable {
+    
+    cursor: pointer;
+    
     &:hover {
-        background-color: @ui-option-hover;
+        //background-color: @ui-option-hover;
+        
     }
 }
 
@@ -122,7 +127,7 @@ input.umb-table__input {
     margin: 0 auto;
     font-size: 20px;
     line-height: 20px;
-    color: @gray-7;
+    color: @ui-option-type;
 }
 
 .umb-table-body__checkicon,
@@ -135,9 +140,30 @@ input.umb-table__input {
 }
 
 .umb-table-body .umb-table__name {
-    color: @black;
+    color: @ui-option-type;
     font-size: 14px;
     font-weight: bold;
+    a {
+        color: @ui-option-type;
+        &:hover, &:focus {
+            color: @ui-option-type-hover;
+            text-decoration: underline;
+        }
+    }
+}
+.umb-table-body .umb-table-row.-light {
+    .umb-table-body__icon {
+        color: @ui-option-disabled-type;
+    }
+    .umb-table__name {
+        color: @ui-option-disabled-type;
+        a {
+            color: @ui-option-disabled-type;
+            &:hover, &:focus {
+                color: @ui-option-disabled-type-hover;
+            }
+        }
+    }
 }
 
 // Styles of no items in the listview
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
index d8813e3815..bc85ae90a9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
@@ -32,17 +32,10 @@
     }
     
     .umb-user-table-row {
-        cursor: default;
         .umb-checkmark {
             visibility: hidden;
         }
     }
-
-    .umb-user-table-row.-selectable {
-        cursor: pointer;
-        
-        
-    }
     
     &.-has-selection {
         .umb-user-table-row.-selectable {
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 19098b8a98..7816516a71 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -130,8 +130,12 @@
 // -------------------------
 
 @ui-option-type:        @blueExtraDark;
-@ui-option-hover:       @sand-7;
 @ui-option-type-hover:  @blueMid;
+@ui-option-hover:       @sand-7;
+
+@ui-option-disabled-type:        @gray-6;
+@ui-option-disabled-type-hover:  @gray-5;
+@ui-option-disabled-hover:       @sand-7;
 
 //@ui-active:           #346ab3;
 @ui-active:             @pinkLight;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index 65955f31eb..63b9c5b787 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -10,7 +10,6 @@
                            ng-checked="vm.isSelectedAll()">
                 </div>
                 <div class="umb-table-cell umb-table__name">
-                    <a class="umb-table-head__link sortable" href="#" ng-click="vm.sort('Name', true, true)" prevent-default>
                         <localize key="general_name">Name</localize>
                         <i class="umb-table-head__icon icon" ng-class="{'icon-navigation-up': vm.isSortDirection('Name', 'asc'), 'icon-navigation-down': vm.isSortDirection('Name', 'desc')}"></i>
                     </a>
@@ -30,9 +29,9 @@
         </div>
         <!-- Listview body section -->
         <div class="umb-table-body">
-            <div class="umb-table-row"
+            <div class="umb-table-row -selectable"
                  ng-repeat="item in vm.items track by $index"
-                 ng-class="{'umb-table-row--selected':item.selected}"
+                 ng-class="{'umb-table-row--selected':item.selected, '-light':!item.published && item.updater != null}"
                  ng-click="vm.selectItem(item, $index, $event)">
 
                 <div class="umb-table-cell">

From 560367debe0a8b9e40a8731aaa5b52bea4985d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 16:15:01 +0100
Subject: [PATCH 055/130] hover state for umb-table item

---
 .../src/less/components/umb-table.less                | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index 15cb007a01..bd79e88a2b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -102,6 +102,17 @@ input.umb-table__input {
     &:hover {
         //background-color: @ui-option-hover;
         
+        &::before {
+            content: "";
+            position: absolute;
+            z-index:1;
+            top: 1px;
+            left: 1px;
+            right: 1px;
+            bottom: 1px;
+            border: 2px solid rgba(@ui-selected-border, .33);
+            pointer-events: none;
+        }
     }
 }
 

From bd8f950ba1e05fb3c98d2792c9a81740e01a2de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 16:30:18 +0100
Subject: [PATCH 056/130] hover state for umb-table and umb-mini-list-view

---
 .../src/less/components/umb-table.less        | 51 +++++++++----------
 .../less/components/users/umb-user-cards.less | 16 ++++--
 .../views/components/umb-mini-list-view.html  |  2 +-
 .../src/views/components/umb-table.html       |  2 +-
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index bd79e88a2b..6674e01475 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -96,22 +96,33 @@ input.umb-table__input {
     min-height: 52px;
 }
 .umb-table-body .umb-table-row.-selectable {
-    
     cursor: pointer;
-    
+}
+.umb-table-row.-selected, 
+.umb-table-body .umb-table-row.-selectable:hover {
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:1;
+        top: 1px;
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        border: 2px solid @ui-selected-border;
+        pointer-events: none;
+    }
+}
+.umb-table-body .umb-table-row.-selectable {
     &:hover {
-        //background-color: @ui-option-hover;
-        
         &::before {
-            content: "";
-            position: absolute;
-            z-index:1;
-            top: 1px;
-            left: 1px;
-            right: 1px;
-            bottom: 1px;
-            border: 2px solid rgba(@ui-selected-border, .33);
-            pointer-events: none;
+            opacity:.33;
+        }
+    }
+}
+.umb-table-body .umb-table-row.-selected.-selectable {
+    &:hover {
+        &::before {
+            opacity:.66;
         }
     }
 }
@@ -187,7 +198,7 @@ input.umb-table__input {
 }
 
 // Show checkmark when checked, hide file icon
-.umb-table-row--selected {
+.umb-table-row.-selected {
     
     .umb-table-body__fileicon {
         display: none;
@@ -196,18 +207,6 @@ input.umb-table__input {
         display: inline-block;
     }
     
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:1;
-        top: 1px;
-        left: 1px;
-        right: 1px;
-        bottom: 1px;
-        border: 2px solid @ui-selected-border;
-        box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
-        pointer-events: none;
-    }
 }
 
 // Table Row Styles
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index 190f977880..a0ee49a621 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -21,7 +21,7 @@
 .umb-user-card.-selectable {
     cursor: pointer;
 }
-.umb-user-card.-selected {
+.umb-user-card.-selected, .umb-user-card.-selectable:hover {
     &::before {
         content: "";
         position: absolute;
@@ -30,10 +30,20 @@
         left: -2px;
         right: -2px;
         bottom: -2px;
-        border: 2px solid @ui-selected-border;
         border-radius: 5px;
-        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
         pointer-events: none;
+        border: 2px solid @ui-selected-border;
+        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+    }
+}
+.umb-user-card.-selectable:hover {
+    &::before {
+        opacity: .33;
+    }
+}
+.umb-user-card.-selected:hover {
+    &::before {
+        opacity: .66;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
index 317b0f9684..55d7bd0744 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
@@ -63,7 +63,7 @@
                 <div class="umb-table-row"
                     ng-repeat="child in miniListView.children"
                     ng-click="selectNode(child)"
-                    ng-class="{'umb-table-row--selected':child.selected, 'not-allowed':!child.allowed}">
+                    ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">
                     <div class="umb-table-cell umb-table-cell--auto-width" ng-class="{'umb-table-cell--faded':child.published === false}">
                         <div class="flex items-center">
                             <ins class="icon-navigation-right umb-table__row-expand" ng-click="openNode($event, child)" ng-class="{'umb-table__row-expand--hidden': child.metaData.hasChildren !== true}">&nbsp;</ins>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index 63b9c5b787..befdd8ee78 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -31,7 +31,7 @@
         <div class="umb-table-body">
             <div class="umb-table-row -selectable"
                  ng-repeat="item in vm.items track by $index"
-                 ng-class="{'umb-table-row--selected':item.selected, '-light':!item.published && item.updater != null}"
+                 ng-class="{'-selected':item.selected, '-light':!item.published && item.updater != null}"
                  ng-click="vm.selectItem(item, $index, $event)">
 
                 <div class="umb-table-cell">

From fa042194b7752fe1aa6b07a416f91414526c15eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 16:50:05 +0100
Subject: [PATCH 057/130] hover state for umb-content-grid-item

---
 .../src/less/components/umb-content-grid.less | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 2a4a3be2e4..561e6c2b6a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -15,21 +15,35 @@
    border-radius: 3px;
 }
 
-.umb-content-grid__item.-selected {    
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:2;
-        top: -2px;
-        left: -2px;
-        right: -2px;
-        bottom: -2px;
-        border: 2px solid @ui-selected-border;
-        border-radius: 5px;
-        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
-        pointer-events: none;
+.umb-content-grid__item {
+    &.-selected, &:hover {
+        &::before {
+            content: "";
+            position: absolute;
+            z-index: 2;
+            top: -2px;
+            left: -2px;
+            right: -2px;
+            bottom: -2px;
+            border: 2px solid @ui-selected-border;
+            border-radius: 5px;
+            box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+            pointer-events: none;
+        }
+        
+    }
+}
+
+
+.umb-content-grid__item:hover {    
+    &::before {
+        opacity: .33;
+    }
+}
+.umb-content-grid__item.-selected:hover {    
+    &::before {
+        opacity: .66;
     }
-    
 }
 
 .umb-content-grid__icon-container {

From 30eb097f9c2189d39a94df366a2b86a61ee7591a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Mar 2019 19:03:02 +0100
Subject: [PATCH 058/130] hover state for media grid + corrected hover state
 opacity + rounded corner for media info tooltip

---
 .../less/components/tooltip/umb-tooltip.less  |  1 +
 .../src/less/components/umb-content-grid.less |  2 +-
 .../src/less/components/umb-folder-grid.less  | 19 ++++++++++---
 .../src/less/components/umb-media-grid.less   | 27 ++++++++++++-------
 .../less/components/users/umb-user-cards.less |  2 +-
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
index 77eba94b6d..5158d32304 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
@@ -11,4 +11,5 @@
    animation: fadeIn;
    margin-top: 15px;
    pointer-events: none;
+   border-radius: 3px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 561e6c2b6a..84cfe04263 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -42,7 +42,7 @@
 }
 .umb-content-grid__item.-selected:hover {    
     &::before {
-        opacity: .66;
+        opacity: .75;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
index ffdd4d9322..6a93a10e9f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
@@ -27,7 +27,12 @@
 
 .umb-folder-grid__folder.-selected {
     color:@ui-selected-type;
-    
+    &:hover {
+        color:@ui-selected-type-hover;
+    }
+}
+
+.umb-folder-grid__folder.-selected, .umb-folder-grid__folder:hover {
     &::before {
         content: "";
         position: absolute;
@@ -41,9 +46,15 @@
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
         pointer-events: none;
     }
-    
-    &:hover {
-        color:@ui-selected-type-hover;
+}
+.umb-folder-grid__folder:hover {
+    &::before {
+        opacity: .33;
+    }
+}
+.umb-folder-grid__folder.-selected:hover {
+    &::before {
+        opacity: .75;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 7a6cd043a4..83692d468f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -38,12 +38,12 @@
 }
 
 .umb-media-grid__item.-selected {
-    
-    //background: @ui-selected;
     color:@ui-selected-type;
-    //border-color: @ui-selected-border;
-    //box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
-    
+    .umb-media-grid__item-overlay {
+        color: @ui-selected-type;
+    }
+}
+.umb-media-grid__item.-selected, .umb-media-grid__item:hover {
     &::before {
         content: "";
         position: absolute;
@@ -57,12 +57,16 @@
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
         pointer-events: none;
     }
-    
-    .umb-media-grid__item-overlay {
-        color: @ui-selected-type;
-        //background: @ui-selected-border;
+}
+.umb-media-grid__item:hover {
+    &::before {
+        opacity: .33;
+    }
+}
+.umb-media-grid__item.-selected:hover {
+    &::before {
+        opacity: .75;
     }
-    
 }
 
 .umb-media-grid__item-file-icon > span {
@@ -158,6 +162,9 @@
 
 .umb-media-grid__item:hover .umb-media-grid__item-overlay {
    opacity: 1;
+   i {
+       text-decoration: none;
+   }
 }
 
 .umb-media-grid__item-name {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index a0ee49a621..3bc431e01f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -43,7 +43,7 @@
 }
 .umb-user-card.-selected:hover {
     &::before {
-        opacity: .66;
+        opacity: .75;
     }
 }
 

From 685c4e351b50c9e3e582dc257d004c7a6679b012 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Mar 2019 21:31:35 +0100
Subject: [PATCH 059/130] Update readme

---
 .github/README.md     |  70 ++++++++++++++----------------------------
 .github/img/logo.png  | Bin 0 -> 8676 bytes
 .github/img/vimeo.png | Bin 27438 -> 0 bytes
 3 files changed, 23 insertions(+), 47 deletions(-)
 create mode 100644 .github/img/logo.png
 delete mode 100644 .github/img/vimeo.png

diff --git a/.github/README.md b/.github/README.md
index 1c1f5e3c41..9e7e977e9b 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,64 +1,40 @@
-[![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=dev-v8)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
+# [Umbraco CMS](https://umbraco.com) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=dev-v8)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
 
+Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social. 
 
-_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
+Learn more at [umbraco.com](https://umbraco.com)
 
-_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/dev-v7) to go to the v7 branch._
+<p align="center">
+  <img src="img/logo.png" alt="Umbraco Logo" />
+</p>
 
-_Ready to try out Version 8? [See the quick start guide](V8_GETTING_STARTED.md)._
+See the official [Umbraco website](https://umbraco.com) for an introduction, core mission and values of the product and team behind it.
 
-When is Umbraco 8 coming?
-=========================
-When it's ready. We're done with the major parts of the architecture work and are focusing on three separate tracks to prepare Umbraco 8 for release:
-1) Editor Track (_currently in progress_). Without editors, there's no market for Umbraco. So we want to make sure that Umbraco 8 is full of love for editors.
-2) Partner Track. Without anyone implementing Umbraco, there's nothing for editors to update. So we want to make sure that Umbraco 8 is a joy to implement
-3) Contributor Track. Without our fabulous ecosystem of both individual Umbracians and 3rd party ISVs, Umbraco wouldn't be as rich a platform as it is today. We want to make sure that it's easy, straight forward and as backwards-compatible as possible to create packages for Umbraco
+- [Getting Started](#getting-started)
+- [Documentation](#documentation)
+- [Contributing](#contributing)
+- [Community](#join-the-umbraco-community)
 
-Once a track is done, we start releasing previews where we ask people to test the features we believe are ready. While the testing is going on and we gather feedback, we move on to the next track. This doesn't mean that there hasn't already been work done in the area, but that a track focuses on finalizing, polishing and preparing the features for release.
+Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
 
-Umbraco CMS
-===========
-The friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](img/vimeo.png)](https://vimeo.com/172382998/)
-
-## Umbraco CMS
-Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
-## Watch an introduction video
-
-[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
-
-## Umbraco - The Friendly CMS
-
-For the first time on the Microsoft platform, there is a free user- and developer-friendly CMS that makes it quick and easy to create websites - and a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, right out of the box.
-
-Umbraco is not only loved by developers, but is a content editor's dream. Enjoy intuitive editing tools, media management, responsive views, and approval workflows to send your content live.
-
-Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scalable. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay.
-
-To view more examples, please visit [https://umbraco.com/case-studies-testimonials/](https://umbraco.com/case-studies-testimonials/)
-
-## Why Open Source?
-As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible, and community contributions and packages are available for all to use.
-
-## Trying out Umbraco CMS
+## Getting Started
 
 [Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet, with full support for all your custom .NET code and integrations. You're up and running in less than a minute, and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
 
-If you want to DIY, you can [download Umbraco](https://our.umbraco.com/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
+If you want to DIY, you can [download Umbraco]((https://our.umbraco.com/download)) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
 
-## Community
+## Documentation
 
-Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
+The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
 
-## Contribute to Umbraco
+## Join the Umbraco community
 
-Umbraco is contribution-focused and community-driven. If you want to contribute back to Umbraco, please check out our [guide to contributing](CONTRIBUTING.md).
+Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com/). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
 
-## Found a bug?
+Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://twitter.com/umbraco), [Release Updates](https://twitter.com/umbracoproject), [#umbraco](https://twitter.com/hashtag/umbraco)
 
-Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](CONTRIBUTING_DETAILED.md#reporting-bugs).
 
-You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
-Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/), the old issue tracker is in read-only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).
+## Contributing
+
+Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
+
diff --git a/.github/img/logo.png b/.github/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b761707588cbdaef018e2a1271d0b91c088f0ebe
GIT binary patch
literal 8676
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
Oz(C(vuR;eN{r>=svyU<W

literal 0
HcmV?d00001

diff --git a/.github/img/vimeo.png b/.github/img/vimeo.png
deleted file mode 100644
index d3c12465bacf5816041ca754a9a6ac4113ffe726..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27438
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
GUj84hS(HKm


From 23656f017cca700c1c91ecabdd611800ef37e04d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Mar 2019 22:02:52 +0100
Subject: [PATCH 060/130] More readme updates

---
 .github/BUILD.md              | 293 ++++++++++++++++++++--------------
 .github/CLEAR.md              |  34 ----
 .github/README.md             |   2 +-
 .github/V8_GETTING_STARTED.md |  37 -----
 4 files changed, 172 insertions(+), 194 deletions(-)
 delete mode 100644 .github/CLEAR.md
 delete mode 100644 .github/V8_GETTING_STARTED.md

diff --git a/.github/BUILD.md b/.github/BUILD.md
index a2406c58bd..9f755e1c05 100644
--- a/.github/BUILD.md
+++ b/.github/BUILD.md
@@ -1,14 +1,177 @@
-Umbraco Cms Build
---
-----
+# Umbraco Cms Build
 
-# Quick!
+## Are you sure?
 
-To build Umbraco, fire PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `README.md`...). There, trigger the build with the following command:
+In order to use Umbraco as a CMS and build your website with it, you should not build it yourself. If you're reading this then you're trying to contribute to Umbraco or you're debugging a complex issue.
+
+- Are you about to create a pull request for Umbraco?
+- Are you trying to get to the bottom of a problem in your existing Umbraco installation?
+
+If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
+
+#### Table of contents
+
+[Building from source](#building-from-source)
+  * [The quick build](#quick!)
+  * [Build infrastructure](#build-infrastructure)
+    * [Properties](#properties)
+    * [GetUmbracoVersion](#getumbracoversion)
+    * [SetUmbracoVersion](#setumbracoversion)
+    * [Build](#build)
+    * [Build](#build)
+    * [Build-UmbracoDocs](#build-umbracodocs)
+    * [Verify-NuGet](#verify-nuget)
+  * [Cleaning up](#cleaning-up)
+
+[Azure DevOps](#azure-devops)
+
+[Quirks](#quirks)
+  * [Powershell quirks](#powershell-quirks)
+  * [Git quirks](#git-quirks)
+
+
+## Building from source
+
+Did you read ["Are you sure"](#are-you-sure)?
+
+### Quick!
+
+To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `LICENSE.md`...). There, trigger the build with the following command:
 
     build/build.ps1
     
-## PowerShell Quirks
+You might run into [Powershell quirks](#powershell-quirks).
+
+### Build Infrastructure
+
+The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
+
+    $ubuild = build/build.ps1 -get
+
+The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
+    
+#### Properties
+
+The object exposes the following properties:
+
+* `SolutionRoot`: the absolute path to the solution root
+* `VisualStudio`: a Visual Studio object (see below)
+* `NuGet`: the absolute path to the NuGet executable
+* `Zip`: the absolute path to the 7Zip executable
+* `VsWhere`: the absolute path to the VsWhere executable
+* `NodePath`: the absolute path to the Node install
+* `NpmPath`: the absolute path to the Npm install
+
+The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
+
+* `Path`: Visual Studio installation path (eg some place under `Program Files`)
+* `Major`: Visual Studio major version (eg `15` for VS 2017)
+* `Minor`: Visual Studio minor version
+* `MsBUild`: the absolute path to the MsBuild executable
+
+#### GetUmbracoVersion
+
+Gets an object representing the current Umbraco version. Example:
+
+    $v = $ubuild.GetUmbracoVersion()
+    Write-Host $v.Semver
+
+The object exposes the following properties:
+
+* `Semver`: the semver object representing the version
+* `Release`: the main part of the version (eg `7.6.33`)
+* `Comment`: the pre release part of the version (eg `alpha02`)
+* `Build`: the build number part of the version (eg `1234`)
+
+#### SetUmbracoVersion
+
+Modifies Umbraco files with the new version.
+
+>This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
+
+The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
+
+    $ubuild.SetUmbracoVersion("7.6.33")
+    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
+    $ubuild.SetUmbracoVersion("7.6.33+1234")
+    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
+
+#### Build
+
+Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
+
+    $ubuild.Build()
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+**Note: web.config**
+
+Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
+
+#### Build-UmbracoDocs
+
+Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
+
+    Build-UmbracoDocs
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+#### Verify-NuGet
+
+Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
+
+    Verify-NuGet
+
+### Cleaning up
+
+Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
+
+At the very minimum, you want
+
+    git clean -Xdf src/Umbraco.Web.UI/App_Data
+    rm src/Umbraco.Web.UI/web.config
+
+Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
+
+The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
+
+This will leave media files and views around, but in most cases, it will be enough.
+
+To perform a more complete clear, you will want to also delete the content of the media, views, scripts... directories.
+
+The following command will force remove all untracked files and directories, whether they are ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
+
+    git clean -xdf .
+    
+For git documentation see:
+* git [clean](<https://git-scm.com/docs/git-clean>)
+* git [reset](<https://git-scm.com/docs/git-reset>)
+
+## Azure DevOps
+
+Umbraco uses Azure DevOps for continuous integration, nightly builds and release builds. The Umbraco CMS project on DevOps [is available for anonymous users](https://umbraco.visualstudio.com/Umbraco%20Cms).
+
+DevOps uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
+
+* `pre-build`: prepares the build
+* `compile-belle`: compiles Belle
+* `compile-umbraco`: compiles Umbraco
+* `pre-tests`: prepares the tests
+* `compile-tests`: compiles the tests
+* `pre-packages`: prepares the packages
+* `pkg-zip`: creates the zip files
+* `pre-nuget`: prepares NuGet packages
+* `pkg-nuget`: creates NuGet packages
+
+All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated DevOps tasks. Similarly, creating the NuGet packages is also performed by dedicated DevOps tasks.
+
+Finally, the produced artifacts are published in two containers that can be downloaded from DevOps: `zips` contains the zip files while `nuget` contains the NuGet packages.
+
+>During a DevOps build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in DevOps tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with DevOps at the moment.
+
+## Quirks
+
+### PowerShell Quirks
 
 There is a good chance that running `build.ps1` ends up in error, with messages such as
 
@@ -45,120 +208,6 @@ The best solution is to unblock the Zip file before un-zipping: right-click the
 
     PS> Get-ChildItem -Recurse *.* | Unblock-File
 
-## Git Quirks
+### Git Quirks
 
-Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
-
-# Build Infrastructure
-
-The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
-
-    $ubuild = build/build.ps1 -get
-
-The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
-    
-## Properties
-
-The object exposes the following properties:
-
-* `SolutionRoot`: the absolute path to the solution root
-* `VisualStudio`: a Visual Studio object (see below)
-* `NuGet`: the absolute path to the NuGet executable
-* `Zip`: the absolute path to the 7Zip executable
-* `VsWhere`: the absolute path to the VsWhere executable
-* `NodePath`: the absolute path to the Node install
-* `NpmPath`: the absolute path to the Npm install
-
-The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
-
-* `Path`: Visual Studio installation path (eg some place under `Program Files`)
-* `Major`: Visual Studio major version (eg `15` for VS 2017)
-* `Minor`: Visual Studio minor version
-* `MsBUild`: the absolute path to the MsBuild executable
-
-## GetUmbracoVersion
-
-Gets an object representing the current Umbraco version. Example:
-
-    $v = $ubuild.GetUmbracoVersion()
-    Write-Host $v.Semver
-
-The object exposes the following properties:
-
-* `Semver`: the semver object representing the version
-* `Release`: the main part of the version (eg `7.6.33`)
-* `Comment`: the pre release part of the version (eg `alpha02`)
-* `Build`: the build number part of the version (eg `1234`)
-
-## SetUmbracoVersion
-
-Modifies Umbraco files with the new version.
-
->This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
-
-The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
-
-    $ubuild.SetUmbracoVersion("7.6.33")
-    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
-    $ubuild.SetUmbracoVersion("7.6.33+1234")
-    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
-
-## Build
-
-Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
-
-    $ubuild.Build()
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-### web.config
-
-Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
-
-## Build-UmbracoDocs
-
-Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
-
-    Build-UmbracoDocs
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-## Verify-NuGet
-
-Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
-
-    Verify-NuGet
-
-# VSTS
-
-Continuous integration, nightly builds and release builds run on VSTS.
-
-VSTS uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
-
-* `pre-build`: prepares the build
-* `compile-belle`: compiles Belle
-* `compile-umbraco`: compiles Umbraco
-* `pre-tests`: prepares the tests
-* `compile-tests`: compiles the tests
-* `pre-packages`: prepares the packages
-* `pkg-zip`: creates the zip files
-* `pre-nuget`: prepares NuGet packages
-* `pkg-nuget`: creates NuGet packages
-
-All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated VSTS tasks. Similarly, creating the NuGet packages is also performed by dedicated VSTS tasks.
-
-Finally, the produced artifacts are published in two containers that can be downloaded from VSTS: `zips` contains the zip files while `nuget` contains the NuGet packages.
-
->During a VSTS build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in VSTS tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with VSTS at the moment.
-
-# Notes
-
-*This part needs to be cleaned up*
-
-Nightlies should use some sort of build number.
-
-We should increment versions as soon as a version is released. Ie, as soon as `7.6.33` is released, we should `Set-UmbracoVersion 7.6.34-alpha` and push.
-
-NuGet / NuSpec consistency checks are performed in tests. We should move it so it is done as part of the PowerShell script even before we try to compile and run the tests.
-
-/eof
\ No newline at end of file
+Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
\ No newline at end of file
diff --git a/.github/CLEAR.md b/.github/CLEAR.md
deleted file mode 100644
index 84dc0b46d7..0000000000
--- a/.github/CLEAR.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Umbraco Cms Clear
---
-----
-
-Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
-
-## Fast
-
-At the very minimum, you want
-
-    git clean -Xdf src/Umbraco.Web.UI/App_Data
-    rm src/Umbraco.Web.UI/web.config
-
-Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
-
-The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
-
-This will leave medias and views around, but in most cases, it will be enough.
-
-## More
-
-To perform a more complete clear, you will want to also delete the content of the media, views, masterpages, scripts... directories.
-
-## Full
-
-The following command will force remove all untracked files and directories, be they ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
-
-    git clean -xdf .
-    
-## Docs
-
-See
-* git [clean](<https://git-scm.com/docs/git-clean>)
-* git [reset](<https://git-scm.com/docs/git-reset>)
\ No newline at end of file
diff --git a/.github/README.md b/.github/README.md
index 9e7e977e9b..6d46466681 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -12,8 +12,8 @@ See the official [Umbraco website](https://umbraco.com) for an introduction, cor
 
 - [Getting Started](#getting-started)
 - [Documentation](#documentation)
-- [Contributing](#contributing)
 - [Community](#join-the-umbraco-community)
+- [Contributing](#contributing)
 
 Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
 
diff --git a/.github/V8_GETTING_STARTED.md b/.github/V8_GETTING_STARTED.md
deleted file mode 100644
index 49a898cfe1..0000000000
--- a/.github/V8_GETTING_STARTED.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## A quick start guide for getting up and runnning with Umbraco v8
-
-### What you need:
-
-* [Visual Studio 2017 Community (Free)](https://www.visualstudio.com/vs/community/), or Professional, Enterprise, etc... _(**Minimum of Version 15.7** or higher, this is important, you WILL get issues with lesser versions)_
-* .NET Framework 4.7.2 installed, get it here: https://www.microsoft.com/net/download/thank-you/net472?survey=false
-* .NET Framework 4.7.2 developer pack, get it here: https://www.microsoft.com/net/download/thank-you/net472-developer-pack _(be sure this is the ENU file which will be named `NDP472-DevPack-ENU.exe`)_
-* Clone the Umbraco repository using the `dev-v8` branch. If your git client doesn't support specifying the branch as you clone then use the command `git clone --single-branch -b dev-v8 <your fork url>`. _(If you clone the repo using the default v7 branch and then checkout the `dev-v8` branch you **might** get problems)_
-
-### Start the solution
-
-* Open the `/src/umbraco.sln` Visual Studio solution
-* Start the solution (easiest way is to use `ctrl + F5`)
-* When the solution is first built this may take some time since it will restore all nuget and npm packages, build the .net solution and also build the angular solution
-* When the website starts you'll see the Umbraco installer and just follow the prompts
-* You're all set!
-
-### Want to run from a zip instead?
-
-If you just want to try out a few things, you can run the site from a zip file which you can download from here https://github.com/umbraco/Umbraco-CMS/releases/tag/temp8-cg18. 
-
-We recommend running the site with the Visual Studio since you'll be able to remain up to date with the latest source code changes.
-
-### Making code changes
-
-* _[The process for making code changes in v8 is the same as v7](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md)_
-* Any .NET changes you make you just need to compile
-* Any Angular/JS changes you make you will need to make sure you are running the Gulp build. Easiest way to do this is from within Visual Studio in the `Task Runner Explorer`. You can find this window by pressing `ctrl + q` and typing in `Task Runner Explorer`. In this window you'll see all Gulp tasks, double click on the `dev` task, this will compile the angular solution and start a file watcher, then any html/js changes you make are automatically built.  
-* When making js changes, you should have the chrome developer tools open to ensure that cache is disabled
-* If you are only making C# changes and are not touching the UI code at all, you can significantly speed up the VS build by adding an empty file specifically called `~/src/preserve.belle`. The UI (Belle) build will then be skipped during a Rebuild.
-
-### What to work on?
-
-We are keeping track of [known issues and limitations here](http://issues.umbraco.org/issue/U4-11279). These line items will eventually be turned into actual tasks to be worked on. Feel free to help us keep this list updated if you find issues and even help fix some of these items. If there is a particular item you'd like to help fix please mention this on the task and we'll create a sub task for the item to continue discussion there.
-
-There's [a list of tasks for v8 that haven't been completed](https://github.com/umbraco/Umbraco-CMS/labels/release%2F8.0.0). If you are interested in helping out with any of these please mention this on the task. This list will be constantly updated as we begin to document and design some of the other tasks that still need to get done.
-

From 1c9d1718e7ca1e793b2c60e2e8bea65851bf6bf3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Mar 2019 22:53:31 +0100
Subject: [PATCH 061/130] More readme updates

---
 .github/BUILD.md                   |   5 +-
 .github/CONTRIBUTING.md            | 126 +++++++++++++++++++----
 .github/CONTRIBUTING_DETAILED.md   | 160 -----------------------------
 .github/CONTRIBUTION_GUIDELINES.md |  33 ------
 .github/PULL_REQUEST_TEMPLATE.md   |  11 +-
 .github/REVIEW_PROCESS.md          |  25 -----
 .github/img/defaultbranch.png      | Bin 18754 -> 15454 bytes
 7 files changed, 120 insertions(+), 240 deletions(-)
 delete mode 100644 .github/CONTRIBUTING_DETAILED.md
 delete mode 100644 .github/CONTRIBUTION_GUIDELINES.md
 delete mode 100644 .github/REVIEW_PROCESS.md

diff --git a/.github/BUILD.md b/.github/BUILD.md
index 9f755e1c05..c89a1be460 100644
--- a/.github/BUILD.md
+++ b/.github/BUILD.md
@@ -9,16 +9,15 @@ In order to use Umbraco as a CMS and build your website with it, you should not
 
 If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
 
-#### Table of contents
+**Table of contents**
 
 [Building from source](#building-from-source)
-  * [The quick build](#quick!)
+  * [The quick build](#quick)
   * [Build infrastructure](#build-infrastructure)
     * [Properties](#properties)
     * [GetUmbracoVersion](#getumbracoversion)
     * [SetUmbracoVersion](#setumbracoversion)
     * [Build](#build)
-    * [Build](#build)
     * [Build-UmbracoDocs](#build-umbracodocs)
     * [Verify-NuGet](#verify-nuget)
   * [Cleaning up](#cleaning-up)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 1431f744c6..bb962cb04b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,4 +1,3 @@
-_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/dev-v8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
 # Contributing to Umbraco CMS
 
 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
@@ -9,12 +8,35 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to
 
 Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
 
+**Code of conduct**
+
+This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+**Table of contents**
+
+[Contributing code changes](#contributing-code-changes)
+  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
+  * [What can I start with?](#what-can-i-start-with)
+  * [How do I begin?](#how-do-i-begin)
+  * [Pull requests](#pull-requests)
+
+[Reviews](#reviews)
+  * [Styleguides](#styleguides)
+  * [The PR team](#the-pr-team)
+  * [Questions?](#questions)
+
+[Working with the code](#working-with-the-code)
+  * [Building Umbraco from source code](#building-umbraco-from-source-code)
+  * [Working with the source code](#working-with-the-source-code)
+  * [Making changes after the PR was opened](#making-changes-after-the-pr-was-opened)
+  * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
+  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+
 ## Contributing code changes
 
-This document gives you a quick overview on how to get started, we will link to in-depth documentation throughout if you need some more background info.
+This document gives you a quick overview on how to get started.
 
-
-## Guidelines for contributions we welcome
+### Guidelines for contributions we welcome
 
 Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
 
@@ -22,7 +44,11 @@ We have [documented what we consider small and large changes](CONTRIBUTION_GUIDE
 
 Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
 
-## How do I begin?
+### What can I start with?
+
+Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
+
+### How do I begin?
 
 Great question! The short version goes like this:
 
@@ -36,17 +62,23 @@ Great question! The short version goes like this:
 
   * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
   * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`
+  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `dev-v8`, create a new branch first.
   * **Push** - great, now you can push the changes up to your fork on GitHub
   * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
 
   ![Create a pull request](img/createpullrequest.png)
 
-### Further reading
+### Pull requests
+The most successful pull requests usually look a like this:
 
-At this point you might want to [read on about contributing in depth](CONTRIBUTING_DETAILED.md). 
+  * Fill in the required template
+  * Include screenshots and animated GIFs in your pull request whenever possible.
+  * Unit tests, while optional are awesome, thank you!
+  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
 
-### Reviews
+Again, these are guidelines, not strict requirements.
+
+## Reviews
 
 You've sent us your first contribution, congratulations! Now what?
 
@@ -59,13 +91,13 @@ We have [a process in place which you can read all about](REVIEW_PROCESS.md). Th
 - The PR will be either merged or rejected within at most 4 weeks
 - Sometimes it is difficult to meet these timelines and we'll talk to you
 
-## Styleguides
+### Styleguides
 
 To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
 
 That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
 
-## The PR team
+### The PR team
 
 The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
 
@@ -76,22 +108,80 @@ The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://g
 
 These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay. 
 
-## Questions?
+### Questions?
 
 You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
 
 - If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
 - Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
 
-## Code of Conduct
+## Working with the code
 
-This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+### Building Umbraco from source code
 
+In order to build the Umbraco source code locally, first make sure you have the following installed.
 
-## Contributing to Umbraco, in depth
+  * Visual Studio 2017 v15.9.7+
+  * Node v10+ 
+  * npm v6.4.1+
 
-There are other ways to contribute, and there's a few more things that you might be wondering about. We will answer the [most common questions and ways to contribute in our detailed documentation](CONTRIBUTING_DETAILED.md).
+The easiest way to get started is to run `build.ps1` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
 
-## Credits
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
 
-This contribution guide borrows heavily from the excellent work on [the Atom contribution guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md). A big [#h5yr](http://h5yr.com/) to them!
+![Gulp build in Visual Studio](img/gulpbuild.png)
+
+After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
+
+### Working with the source code
+
+Some parts of our source code are over 10 years old now. And when we say "old", we mean "mature" of course!
+
+There's two big areas that you should know about:
+
+  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+  You may need to run the following commands to set up gulp properly:
+  ```
+  npm cache clean --force
+  npm install
+  npm run build
+  ```
+  2. "The rest" is a C# based codebase, which is mostly ASP.NET MVC based. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
+
+To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
+
+  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The C# application](https://our.umbraco.com/apidocs/csharp/)
+
+### Which branch should I target for my contributions?
+
+We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `dev-v8`. Whatever the default is, that's where we'd like you to target your contributions.
+
+![Which branch should I target?](img/defaultbranch.png)
+
+### Making changes after the PR was opened
+
+If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
+
+### Keeping your Umbraco fork in sync with the main repository
+
+We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+
+To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
+
+```
+git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
+```
+
+Then when you want to get the changes from the main repository:
+
+```
+git fetch upstream
+git rebase upstream/dev-v8
+```
+
+In this command we're syncing with the `dev-v8` branch, but you can of course choose another one if needed.
+
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
diff --git a/.github/CONTRIBUTING_DETAILED.md b/.github/CONTRIBUTING_DETAILED.md
deleted file mode 100644
index 1f7e827dc8..0000000000
--- a/.github/CONTRIBUTING_DETAILED.md
+++ /dev/null
@@ -1,160 +0,0 @@
-# Contributing in detail
-
-There's more than one way to contribute to Umbraco, there's some more suggestions below.
-
-When contributing code to Umbraco there's plenty of things you'll want to know, skip down to [What should I know before I get started](#what-should-i-know-before-i-get-started) for the answers to your burning questions.
-
-#### Table Of Contents
-
-[How Can I Contribute?](#how-can-i-contribute)
-  * [Reporting Bugs](#reporting-bugs)
-  * [Suggesting Enhancements](#suggesting-enhancements)
-  * [Your First Code Contribution](#your-first-code-contribution)
-  * [Pull Requests](#pull-requests)
-
-[Styleguides](#styleguides)
-
-[What should I know before I get started?](#what-should-i-know-before-i-get-started)
-  * [Working with the source code](#working-with-the-source-code)
-  * [What branch should I target for my contributions?](#what-branch-should-i-target-for-my-contributions)
-  * [Building Umbraco from source code](#building-umbraco-from-source-code)
-  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
-
-## How Can I Contribute?
-
-### Reporting Bugs
-This section guides you through submitting a bug report for Umbraco CMS. Following these guidelines helps maintainers and the community understand your report 📝, reproduce the behavior 💻 💻, and find related reports 🔎.
-
-Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](https://github.com/umbraco/Umbraco-CMS/issues/new/choose), the information it asks for helps us resolve issues faster.
-
-> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
-
-##### Before Submitting A Bug Report
-
-  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.com/download/). We might have already fixed your particular problem.
-  * It also helps tremendously to check if the issue you're experiencing is present in **a clean install** of the Umbraco version you're currently using. Custom code can have side-effects that don't occur in a clean install.
-  * **Use the Google**. Whatever you're experiencing, Google it plus "Umbraco" - usually you can get some pretty good hints from the search results, including open issues and further troubleshooting hints.
-  * If you do find and existing issue has **and the issue is still open**, add a comment to the existing issue if you have additional information. If you have the same problem and no new info to add, just "star" the issue.
-
-Explain the problem and include additional details to help maintainers reproduce the problem. The following is a long description which we've boiled down into a few very simple questions in the issue tracker when you create a new issue. We're listing the following hints to indicate that the most successful reports usually have a lot of this ground covered:
-
-  * **Use a clear and descriptive title** for the issue to identify the problem.
-  * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining which steps you took in the backoffice to get to a certain undesireable result, e.g. you created a document type, inherting 3 levels deep, added a certain datatype, tried to save it and you got an error.
-  * **Provide specific examples to demonstrate the steps**. If you wrote some code, try to provide a code sample as specific as possible to be able to reproduce the behavior.
-  * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
-  * **Explain which behavior you expected to see instead and why.**
-
-Provide more context by answering these questions:
-
-  * **Can you reproduce the problem** when `debug="false"` in your `web.config` file?
-  * **Did the problem start happening recently** (e.g. after updating to a new version of Umbraco) or was this always a problem?
-  * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
-
-Include details about your configuration and environment:
-
-  * **Which version of Umbraco are you using?**
-  * **What is the environment you're using Umbraco in?** Is this a problem on your local machine or on a server. Tell us about your configuration: Windows version, IIS/IISExpress, database type, etc.
-  * **Which packages do you have installed?**
-
-### Suggesting Enhancements
-
-This section guides you through submitting an enhancement suggestion for Umbraco, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion 📝 and find related suggestions 🔎.
-
-Most of the suggestions in the [reporting bugs](#reporting-bugs) section also count for suggesting enhancements.
-
-Some additional hints that may be helpful:
-
-  * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Umbraco which the suggestion is related to.
-  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.com/projects/).
-
-### Your First Code Contribution
-
-Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` and issues](https://issues.umbraco.org/issues?q=&project=U4&tagValue=upforgrabs&release=&issueType=&search=search) or on the [new issue tracker](https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity%2Fup-for-grabs).
-
-### Pull Requests
-
-The most successful pull requests usually look a like this:
-
-  * Fill in the required template
-  * Include screenshots and animated GIFs in your pull request whenever possible.
-  * Unit tests, while optional are awesome, thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
-
-Again, these are guidelines, not strict requirements.
-
-## Making changes after the PR was opened
-
-If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
-
-## Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-## What should I know before I get started?
-
-### Working with the source code
-
-Some parts of our source code is over 10 years old now. And when we say "old", we mean "mature" of course!
-
-There's two big areas that you should know about:
-
-  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
-  You may need to run the following commands to set up gulp properly:
-  ```
-  npm cache clean --force
-  npm install
-  npm run build
-  ```
-  2. "The rest" is a C# based codebase, with some traces of our WebForms past but mostly ASP.NET MVC based these days. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
-
-To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
-
-  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The rest](https://our.umbraco.com/apidocs/csharp/)
-
-### What branch should I target for my contributions?
-
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `dev-v7`. Whatever the default is, that's where we'd like you to target your contributions.
-
-![What branch do you want me to target?](img/defaultbranch.png)
-
-### Building Umbraco from source code
-
-In order to build the Umbraco source code locally, first make sure you have the following installed.
-
-  * Visual Studio 2017 v15.3+
-  * Node v10+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v10)
-  * npm v6.4.1+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v6.4.1)
-
-The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
-
-Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
-
-![Gulp build in Visual Studio](img/gulpbuild.png)
-
-After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
-
-### Keeping your Umbraco fork in sync with the main repository
-
-We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
-
-Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
-
-To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
-
-```
-git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
-```
-
-Then when you want to get the changes from the main repository:
-
-```
-git fetch upstream
-git rebase upstream/dev-v7
-```
-
-In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.
-
-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
diff --git a/.github/CONTRIBUTION_GUIDELINES.md b/.github/CONTRIBUTION_GUIDELINES.md
deleted file mode 100644
index b94feb0b6b..0000000000
--- a/.github/CONTRIBUTION_GUIDELINES.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributing to Umbraco CMS
-
-When you’re considering creating a pull request for Umbraco CMS, we will categorize them in two different sizes, small and large.
-
-The process for both sizes is very similar, as [explained in the contribution document](CONTRIBUTING.md#how-do-i-begin).
-
-## Small PRs
-Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files.
-
-We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process](REVIEW_PROCESS.md).
-
-### Up for grabs
-
-Umbraco HQ will regularly mark newly created issues on the issue tracker with the `Up for grabs` tag. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. These issues are usually small enough to fit in the "Small PRs" category and we encourage anyone to pick them up and help out.  
-
-If you do start working on something, make sure to leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
-
-## Large PRs
-New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.).  
-
-We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations.  
-
-Please make sure to describe your idea in an issue, it helps to put in mockup screenshots or videos.  
-
-If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
-
-If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the [small PRs process](#small-prs) above, we’ll get feedback to you within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
-
-### Pull request or package?
-
-If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and to fix bugs.  
-
-Eventually, a package could "graduate" to be included in the CMS.  
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 55b12e2317..bc0a72539c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,8 +5,17 @@
 If there's an existing issue for this PR then this fixes <!-- link to the issue here! -->
 
 ### Description
-<!-- A description of the changes proposed in the pull-request and how to test these changes -->
+<!-- 
+    A description of the changes proposed in the pull-request and how to test these changes.
 
+    The most successful pull requests usually look a like this:
+
+    * Fill in this template with details: what did you do, why did you do it, how can we test the changes?
+    * Include screenshots and animated GIFs in your pull request whenever possible.
+    * Unit tests, while optional are awesome, thank you!
+
+    While these are guidelines and not strict requirements, they really help us evaluate your PR quicker.
+-->
 
 
 <!-- Thanks for contributing to Umbraco CMS! -->
diff --git a/.github/REVIEW_PROCESS.md b/.github/REVIEW_PROCESS.md
deleted file mode 100644
index 917d25b090..0000000000
--- a/.github/REVIEW_PROCESS.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Review process
-
-You're an awesome person and have sent us your contribution in the form of a pull request! It's now time to relax for a bit and wait for our response. 
-
-In order to set some expectations, here's what happens next.
-
-## Review process
-
-You will get an initial reply within 48 hours (workdays) to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can.
-
-You will get feedback within at most 14 days after opening the PR. You’ll most likely get feedback sooner though. Then there are a few possible outcomes:
-
-- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
-- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
-- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
-- Your proposed change is awesome but.. not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!)
-
-## Are you still available?
-
-We understand you have other things to do and can't just drop everything to help us out.   
-So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
-
-If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
-
-There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
\ No newline at end of file
diff --git a/.github/img/defaultbranch.png b/.github/img/defaultbranch.png
index 0595e0b4eae02db9cf8c983144cf28ef6fa5e474..09919441b6ed9d372324fb32bafc1d47c60a9ccf 100644
GIT binary patch
literal 15454
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

literal 18754
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
bAk_a4bNw63&6@1o00000NkvXXu0mjfE77Oi


From 30b47ff15fd8f941df4467e4a2d64bd13814ebbd Mon Sep 17 00:00:00 2001
From: Paul Seal <prjseal@gmail.com>
Date: Thu, 7 Mar 2019 00:32:58 +0000
Subject: [PATCH 062/130] Update the umbraco ascii art

I thought it would be a good idea to update the ascii art to a font similar to the one in the umbraco logo on the umbraco.com website.
---
 build/NuSpecs/tools/Readme.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt
index 53915436ac..c0f0359fd0 100644
--- a/build/NuSpecs/tools/Readme.txt
+++ b/build/NuSpecs/tools/Readme.txt
@@ -1,10 +1,11 @@
 
-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
+                       888                                         
+                       888                                         
+888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
+888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
+888  888 888  888  888 888  888 888     .d888888 888      888  888 
+Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
+ "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
 
 ----------------------------------------------------
 

From bb23fbbf8d7fa89447a0e8403870a17bf759f4c1 Mon Sep 17 00:00:00 2001
From: Paul Seal <prjseal@gmail.com>
Date: Thu, 7 Mar 2019 00:56:40 +0000
Subject: [PATCH 063/130] increased length of line under the word umbraco

---
 build/NuSpecs/tools/Readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt
index c0f0359fd0..e40b0dbc7e 100644
--- a/build/NuSpecs/tools/Readme.txt
+++ b/build/NuSpecs/tools/Readme.txt
@@ -7,7 +7,7 @@
 Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
  "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
 
-----------------------------------------------------
+------------------------------------------------------------------
 
 Don't forget to build!
 

From 64bc0cf973c389539d0e9e38c72cb8ffd6f3afda Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 20 Mar 2019 07:35:00 +0100
Subject: [PATCH 064/130] Renamed SendingDashboardModelV2 to
 SendingDashboardSlimModel

---
 src/Umbraco.Web/Editors/EditorModelEventManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
index 40c45ca8c3..2b3eb278ee 100644
--- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs
+++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
@@ -18,14 +18,14 @@ namespace Umbraco.Web.Editors
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MemberDisplay>> SendingMemberModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<UserDisplay>> SendingUserModel;
 
-        [Obsolete("Please Use SendingDashboardModelV2")]
+        [Obsolete("Please Use SendingDashboardSlimModel")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboard>>>> SendingDashboardModel;
-        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>>> SendingDashboardModelV2;
+        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>>> SendingDashboardSlimModel;
 
         private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<IDashboardSlim>>> e)
         {
-            var handler = SendingDashboardModelV2;
+            var handler = SendingDashboardSlimModel;
             handler?.Invoke(sender, e);
         }
 

From ff33e0d969ab63c64b520e567c827400e4257b19 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 20 Mar 2019 13:22:22 +0100
Subject: [PATCH 065/130] Fix merge mistake

---
 .../WebApi/Filters/AdminUsersAuthorizeAttribute.cs         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
index e9cb1d8c6e..96226622b0 100644
--- a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Web.Http;
 using System.Web.Http.Controllers;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Editors;
 
 namespace Umbraco.Web.WebApi.Filters
@@ -48,9 +49,9 @@ namespace Umbraco.Web.WebApi.Filters
 
             if (userIds.Length == 0) return base.IsAuthorized(actionContext);
 
-            var users = ApplicationContext.Current.Services.UserService.GetUsersById(userIds);
-            var authHelper = new UserEditorAuthorizationHelper(ApplicationContext.Current.Services.ContentService, ApplicationContext.Current.Services.MediaService, ApplicationContext.Current.Services.UserService, ApplicationContext.Current.Services.EntityService);
-            return users.All(user => authHelper.IsAuthorized(UmbracoContext.Current.Security.CurrentUser, user, null, null, null) != false);
+            var users = Current.Services.UserService.GetUsersById(userIds);
+            var authHelper = new UserEditorAuthorizationHelper(Current.Services.ContentService, Current.Services.MediaService, Current.Services.UserService, Current.Services.EntityService);
+            return users.All(user => authHelper.IsAuthorized(Current.UmbracoContext.Security.CurrentUser, user, null, null, null) != false);
         }
     }
 }

From c589ef199517803796bd26095ed0ed8fad4385ea Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 20 Mar 2019 13:29:39 +0100
Subject: [PATCH 066/130] https://github.com/umbraco/Umbraco-CMS/issues/5024 -
 Fixed issue, when using the culture overload of the Children. Now we use
 ChildrenOfType if alias is set.

---
 src/Umbraco.Web/Editors/TemplateQueryController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index 514d2913ed..ed737e7749 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -103,8 +103,8 @@ namespace Umbraco.Web.Editors
             {
                 contents = sourceDocument == null
                     ? Enumerable.Empty<IPublishedContent>()
-                    : sourceDocument.Children(model.ContentType.Alias);
-                queryExpression.AppendFormat(".Children(\"{0}\")", model.ContentType.Alias);
+                    : sourceDocument.ChildrenOfType(model.ContentType.Alias);
+                queryExpression.AppendFormat(".ChildrenOfType(\"{0}\")", model.ContentType.Alias);
             }
             else
             {

From 99b80e0f569ce24623eb331fd683b5255a64c672 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 8 Jan 2019 12:19:29 +0100
Subject: [PATCH 067/130] Ensure that media in RTEs are always rendered with
 up-to-date sources

---
 .../PropertyEditors/RichTextPropertyEditor.cs |  6 ++-
 .../RteMacroRenderingValueConverter.cs        |  5 ++-
 .../Templates/TemplateUtilities.cs            | 44 +++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index de65a326f7..33f04d7595 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Macros;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -65,7 +66,8 @@ namespace Umbraco.Web.PropertyEditors
                 if (property.Value == null)
                     return null;
 
-                var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(property.Value.ToString(), new Dictionary<string, string>());
+                var propertyValueWithMediaResolved = TemplateUtilities.ResolveMediaFromTextString(property.Value.ToString());
+                var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(propertyValueWithMediaResolved, new Dictionary<string, string>());
                 return parsed;
             }
 
@@ -87,4 +89,4 @@ namespace Umbraco.Web.PropertyEditors
     }
 
     
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index a6ea79d283..c430dbc1ba 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -71,9 +71,10 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
             var sourceString = source.ToString();
 
-            // ensures string is parsed for {localLink} and urls are resolved correctly
+            // ensures string is parsed for {localLink} and urls and media are resolved correctly
             sourceString = TemplateUtilities.ParseInternalLinks(sourceString, preview);
             sourceString = TemplateUtilities.ResolveUrlsFromTextString(sourceString);
+            sourceString = TemplateUtilities.ResolveMediaFromTextString(sourceString);
 
             // ensure string is parsed for macros and macros are executed correctly
             sourceString = RenderRteMacros(sourceString, preview);
@@ -118,4 +119,4 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return sourceString;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index a7e6738374..86db8092a0 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -102,6 +102,9 @@ namespace Umbraco.Web.Templates
         private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?",
             RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
+        private static readonly Regex ResolveImgPattern = new Regex(@"(<img[^>]*src="")([^""\?]*)([^""]*""[^>]*data-udi="")([^""]*)(""[^>]*>)",
+            RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
         /// <summary>
         /// The RegEx matches any HTML attribute values that start with a tilde (~), those that match are passed to ResolveUrl to replace the tilde with the application path.
         /// </summary>
@@ -145,5 +148,46 @@ namespace Umbraco.Web.Templates
         {
             return text.CleanForXss(ignoreFromClean);
         }
+
+        /// <summary>
+        /// Parses the string looking for Umbraco image tags and updates them to their up-to-date image sources.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        /// <remarks>Umbraco image tags are identified by their data-udi attributes</remarks>
+        public static string ResolveMediaFromTextString(string text)
+        {
+            // don't attempt to proceed without a context
+            if (UmbracoContext.Current == null || UmbracoContext.Current.MediaCache == null)
+            {
+                return text;
+            }
+
+            return ResolveImgPattern.Replace(text, match =>
+            {
+                // match groups:
+                // - 1 = from the beginning of the image tag until src attribute value begins
+                // - 2 = the src attribute value excluding the querystring (if present)
+                // - 3 = anything after group 2 and before the data-udi attribute value begins
+                // - 4 = the data-udi attribute value
+                // - 5 = anything after group 4 until the image tag is closed
+                var src = match.Groups[2].Value;
+                var udi = match.Groups[4].Value;
+                if(src.IsNullOrWhiteSpace() || udi.IsNullOrWhiteSpace() || GuidUdi.TryParse(udi, out var guidUdi) == false)
+                {
+                    return match.Value;
+                }
+                var media = UmbracoContext.Current.MediaCache.GetById(guidUdi.Guid);
+                if(media == null)
+                {
+                    // image does not exist - we could choose to remove the image entirely here (return empty string),
+                    // but that would leave the editors completely in the dark as to why the image doesn't show
+                    return match.Value;
+                }
+
+                var url = media.Url;
+                return $"{match.Groups[1].Value}{url}{match.Groups[3].Value}{udi}{match.Groups[5].Value}";
+            });
+        }
     }
 }

From 125423947c6a0118f2ded2e19ac269dd36d0358c Mon Sep 17 00:00:00 2001
From: Mario Lopez <mario@koben.com.au>
Date: Fri, 18 Jan 2019 21:58:16 +1100
Subject: [PATCH 068/130] add Udi[] to TypedContent helper

---
 src/Umbraco.Web/UmbracoHelper.cs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index bb9bd2d50e..f7eafd8301 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -677,6 +677,19 @@ namespace Umbraco.Web
             return TypedContentForObjects(ids);
         }
 
+
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
+        /// <returns>The content items that were found in the cache</returns>
+        public IEnumerable<IPublishedContent> TypedContent(params Udi[] ids)
+        {
+            return TypedContentForObjects(ids);
+        }
+
+
         private IEnumerable<IPublishedContent> TypedContentForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
@@ -753,6 +766,17 @@ namespace Umbraco.Web
             return ContentQuery.TypedContent(ids);
         }
 
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
+        /// <returns>The content items that were found in the cache</returns>
+        public IEnumerable<IPublishedContent> TypedContent(IEnumerable<Udi> ids)
+        {
+            return TypedContentForObjects(ids);
+        }
+
         public IEnumerable<IPublishedContent> TypedContentAtXPath(string xpath, params XPathVariable[] vars)
         {
             return ContentQuery.TypedContentAtXPath(xpath, vars);
@@ -938,6 +962,10 @@ namespace Umbraco.Web
                     guidId = g;
                     return true;
 
+                case Udi u:
+                    guidId = new GuidUdi(u.UriValue).Guid;
+                    return true;
+
                 default:
                     guidId = default;
                     return false;

From 9a6d938004ab1447b2be9ff7cba7ac94ef16ead4 Mon Sep 17 00:00:00 2001
From: Mario Lopez <mario@koben.com.au>
Date: Thu, 28 Feb 2019 11:22:32 +1100
Subject: [PATCH 069/130] fixed xmldoc

---
 src/Umbraco.Web/UmbracoHelper.cs | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index f7eafd8301..f920314075 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -675,12 +675,12 @@ namespace Umbraco.Web
         public IEnumerable<IPublishedContent> TypedContent(params object[] ids)
         {
             return TypedContentForObjects(ids);
-        }
+        }   
 
 
 
         /// <summary>
-        /// Gets the medias corresponding to the identifiers.
+        /// Gets the content corresponding to the identifiers.
         /// </summary>
         /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
         /// <returns>The content items that were found in the cache</returns>
@@ -768,7 +768,7 @@ namespace Umbraco.Web
 
 
         /// <summary>
-        /// Gets the medias corresponding to the identifiers.
+        /// Gets the content corresponding to the identifiers.
         /// </summary>
         /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
         /// <returns>The content items that were found in the cache</returns>
@@ -1306,28 +1306,28 @@ namespace Umbraco.Web
         public IEnumerable<IPublishedContent> TypedSearch(string term, bool useWildCards = true, string searchProvider = null)
         {
             return ContentQuery.TypedSearch(term, useWildCards, searchProvider);
-        }
-
+        }
+
         /// <summary>
         /// Searches content
-        /// </summary>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
+        /// </summary>
+        /// <param name="skip"></param>
+        /// <param name="take"></param>
         /// <param name="totalRecords"></param>
         /// <param name="term"></param>
         /// <param name="useWildCards"></param>
         /// <param name="searchProvider"></param>
         /// <returns></returns>
-        public IEnumerable<IPublishedContent> TypedSearch(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string searchProvider = null)
+        public IEnumerable<IPublishedContent> TypedSearch(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string searchProvider = null)
         {
-            return ContentQuery.TypedSearch(skip, take, out totalRecords, term, useWildCards, searchProvider);
-        }
-
+            return ContentQuery.TypedSearch(skip, take, out totalRecords, term, useWildCards, searchProvider);
+        }
+
         /// <summary>
         /// Searhes content
-        /// </summary>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
+        /// </summary>
+        /// <param name="skip"></param>
+        /// <param name="take"></param>
         /// <param name="totalRecords"></param>
         /// <param name="criteria"></param>
         /// <param name="searchProvider"></param>
@@ -1335,23 +1335,23 @@ namespace Umbraco.Web
         public IEnumerable<IPublishedContent> TypedSearch(int skip, int take, out int totalRecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
         {
             return ContentQuery.TypedSearch(skip, take, out totalRecords, criteria, searchProvider);
-        }
-
+        }
+
         /// <summary>
         /// Searhes content
         /// </summary>
         /// <param name="criteria"></param>
         /// <param name="searchProvider"></param>
         /// <returns></returns>
-        public IEnumerable<IPublishedContent> TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
+        public IEnumerable<IPublishedContent> TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
         {
-            return ContentQuery.TypedSearch(criteria, searchProvider);
-        }
-
+            return ContentQuery.TypedSearch(criteria, searchProvider);
+        }
+
         #endregion
-
+
         #region Xml
-
+
         public dynamic ToDynamicXml(string xml)
         {
             if (string.IsNullOrWhiteSpace(xml)) return null;

From 2c271d3ef4864fdd294cc1b3e9cff7e1db503f7b Mon Sep 17 00:00:00 2001
From: Marcin Bigoraj <marcinbigoraj@gmail.com>
Date: Fri, 18 Jan 2019 14:36:44 +0100
Subject: [PATCH 070/130] Allow RTE to set form dirty again after saving
 content item

---
 .../src/views/propertyeditors/rte/rte.controller.js            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 2b81521ca9..dd76d2e635 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -380,6 +380,9 @@ angular.module("umbraco")
                     if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {
                         $scope.model.value = tinyMceEditor.getContent();
                     }
+					                    
+                    //Allow RTE to set form dirty again
+                    alreadyDirty = false;
                 });
 
                 //when the element is disposed we need to unsubscribe!

From 5d3b62317325788fadb4c84629ba4cc46704da0a Mon Sep 17 00:00:00 2001
From: Tom Fulton <tomnf1@gmail.com>
Date: Fri, 8 Feb 2019 17:15:13 -0700
Subject: [PATCH 071/130] Fix for RTE never being dirty after initial save
 (#4140)

---
 .../src/views/propertyeditors/rte/rte.controller.js   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index dd76d2e635..17dddbe669 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -11,20 +11,15 @@ angular.module("umbraco")
         var n = d.getTime();
         $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
 
-        var alreadyDirty = false;
         function syncContent(editor){
             editor.save();
             angularHelper.safeApply($scope, function () {
                 $scope.model.value = editor.getContent();
             });
 
-            if (!alreadyDirty) {
-                //make the form dirty manually so that the track changes works, setting our model doesn't trigger
-                // the angular bits because tinymce replaces the textarea.
-                var currForm = angularHelper.getCurrentForm($scope);
-                currForm.$setDirty();
-                alreadyDirty = true;
-            }
+            //make the form dirty manually so that the track changes works, setting our model doesn't trigger
+            // the angular bits because tinymce replaces the textarea.
+            angularHelper.getCurrentForm($scope).$setDirty();
         }
 
         tinyMceService.configuration().then(function (tinyMceConfig) {

From 1a4a3504d0796b620350e303e490e76f40828b57 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 20 Mar 2019 23:27:42 +0100
Subject: [PATCH 072/130] Remove unused variable

---
 .../src/views/propertyeditors/rte/rte.controller.js        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 17dddbe669..1fc648083e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -375,9 +375,6 @@ angular.module("umbraco")
                     if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {
                         $scope.model.value = tinyMceEditor.getContent();
                     }
-					                    
-                    //Allow RTE to set form dirty again
-                    alreadyDirty = false;
                 });
 
                 //when the element is disposed we need to unsubscribe!
@@ -386,8 +383,8 @@ angular.module("umbraco")
                 $scope.$on('$destroy', function () {
                     unsubscribe();
 					if (tinyMceEditor !== undefined && tinyMceEditor != null) {
-						tinyMceEditor.destroy()
-					}
+                        tinyMceEditor.destroy();
+                    }
                 });
             });
         });

From 0a3f893f22946319380da0914f2ab5b1e8e0e3e1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 20 Mar 2019 23:44:29 +0100
Subject: [PATCH 073/130] V8: Improve plugin language handling  (#4454)

---
 .../Composing/CompositionExtensions/Services.cs        |  2 --
 .../Implement/LocalizedTextServiceFileSources.cs       | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
index ead2524d80..0baefe104b 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
@@ -98,7 +98,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                 : appPlugins.GetDirectories()
                     .SelectMany(x => x.GetDirectories("Lang"))
                     .SelectMany(x => x.GetFiles("*.xml", SearchOption.TopDirectoryOnly))
-                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 5)
                     .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, false));
 
             //user defined langs that overwrite the default, these should not be used by plugin creators
@@ -106,7 +105,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                 ? Enumerable.Empty<LocalizedTextServiceSupplementaryFileSource>()
                 : configLangFolder
                     .GetFiles("*.user.xml", SearchOption.TopDirectoryOnly)
-                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 10)
                     .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, true));
 
             return new LocalizedTextServiceFileSources(
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
index f620d31fe9..86913071fd 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
@@ -184,8 +184,12 @@ namespace Umbraco.Core.Services.Implement
                 //now load in supplementary
                 var found = _supplementFileSources.Where(x =>
                 {
-                    var fileName = Path.GetFileName(x.File.FullName);
-                    return fileName.InvariantStartsWith(culture.Name) && fileName.InvariantEndsWith(".xml");
+                    var extension = Path.GetExtension(x.File.FullName);
+                    var fileCultureName = Path.GetFileNameWithoutExtension(x.File.FullName).Replace("_", "-").Replace(".user", "");
+                    return extension.InvariantEquals(".xml") && (
+                        fileCultureName.InvariantEquals(culture.Name)
+                        || fileCultureName.InvariantEquals(culture.TwoLetterISOLanguageName)
+                    );
                 });
 
                 foreach (var supplementaryFile in found)
@@ -203,7 +207,7 @@ namespace Umbraco.Core.Services.Implement
                             continue;
                         }
 
-                        if (xChildDoc.Root == null) continue;
+                        if (xChildDoc.Root == null || xChildDoc.Root.Name != "language") continue;
                         foreach (var xArea in xChildDoc.Root.Elements("area")
                             .Where(x => ((string)x.Attribute("alias")).IsNullOrWhiteSpace() == false))
                         {

From da6b54111236787fafa167c8b30a3f53c4059492 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 21 Mar 2019 09:06:01 +0100
Subject: [PATCH 074/130] Show duplicate URLs instead of letting them cause an
 angular error (#3969)

---
 .../components/content/umbcontentnodeinfo.directive.js | 10 +++++++++-
 .../components/content/umb-content-node-info.html      |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index c753ac67d2..05c5dd5e6b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -56,6 +56,13 @@
 
                 // only allow configuring scheduled publishing if the user has publish ("U") and unpublish ("Z") permissions on this node
                 scope.allowScheduledPublishing = _.contains(scope.node.allowedActions, "U") && _.contains(scope.node.allowedActions, "Z");
+
+                ensureUniqueUrls();
+            }
+
+            // make sure we don't show duplicate URLs in case multiple URL providers assign the same URLs to the content (see issue 3842 for details)
+            function ensureUniqueUrls() {
+                scope.node.urls = _.uniq(scope.node.urls);
             }
 
             scope.auditTrailPageChange = function (pageNumber) {
@@ -296,11 +303,12 @@
                 if (!newValue) { return; }
                 if (newValue === oldValue) { return; }
 
-                if(isInfoTab) {
+                if (isInfoTab) {
                     loadAuditTrail();
                     loadRedirectUrls();
                     formatDatesToLocal();
                     setNodePublishStatus(scope.node);
+                    ensureUniqueUrls();
                 }
             });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index 0ed3986fe3..93014c9759 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -6,7 +6,7 @@
             <umb-box-header title-key="general_links"></umb-box-header>
             <umb-box-content class="block-form">
                 <ul class="nav nav-stacked" style="margin-bottom: 0;">
-                    <li ng-repeat="url in node.urls">
+                    <li ng-repeat="url in node.urls track by $index">
                         <a ng-if="node.hasPublishedVersion" href="{{url}}" target="_blank">
                             <i class="icon icon-window-popin"></i>
                             <span>{{url}}</span>

From 23f36b9d4e19eec960cc8b99540b147670aea3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 09:20:50 +0100
Subject: [PATCH 075/130] top: 70px; in infinity mode

---
 .../components/umbstickybar.directive.js         |  4 ++--
 .../editor/subheader/umb-editor-sub-header.less  | 16 ++++++++++++----
 .../src/views/propertyeditors/grid/grid.html     |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index fb5a558fd0..2f2df7c12b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -56,7 +56,7 @@ Use this directive make an element sticky and follow the page when scrolling.
                 }
 
                 if (attr.scrollableContainer) {
-                    scrollableContainer = $(attr.scrollableContainer);
+                    scrollableContainer = bar.closest(attr.scrollableContainer);
                 } else {
                     scrollableContainer = $(window);
                 }
@@ -121,7 +121,7 @@ Use this directive make an element sticky and follow the page when scrolling.
             function calculateSize() {
                 var width = bar.innerWidth();
                 clonedBar.css({
-                    width: width
+                    width: width + 10 // + 10 (5*2) because we need to add border to avoid seeing the shadow beneath. Look at the CSS.
                 });
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 0c11349841..2e599252bb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -1,7 +1,11 @@
 .umb-editor-sub-header {
    padding: 10px 0;
    margin-bottom: 10px;
-   background: @gray-10;
+   background: @brownGrayLight;
+   border-left: 5px solid @brownGrayLight;
+   border-right: 5px solid @brownGrayLight;
+   margin-left: -5px;
+   margin-right: -5px;
    display: flex;
    justify-content: space-between;
    margin-top: -10px;
@@ -12,7 +16,7 @@
     &.nested {
         margin-top: 0;
         margin-bottom: 0;
-        background: @gray-10;
+        background: @brownGrayLight;
     }
 }
 
@@ -25,10 +29,14 @@
 
 .umb-editor-sub-header.-umb-sticky-bar {
     box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
-    transition: box-shadow 1s;
-    top: calc(@appHeaderHeight + @editorHeaderHeight);
+    transition: box-shadow 240ms;
     margin-top: 0;
     margin-bottom: 0;
+    top: calc(@appHeaderHeight + @editorHeaderHeight);
+    
+    .umb-editor--infinityMode & {
+        top: calc(@editorHeaderHeight);
+    }
 }
 
 .umb-group-builder__property-preview .umb-editor-sub-header {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 0c6078478a..f0171e2d00 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
 
-    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white;">
+    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white; border-color: white;">
 
         <umb-editor-sub-header-content-right>
             <umb-button

From e16777fc28a1a8ce6bee9d8ec149820bfe380187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 09:21:37 +0100
Subject: [PATCH 076/130] remove debugger;

---
 .../propertyeditors/checkboxlist/checkboxlist.controller.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 43e50dc392..045a33ac32 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -48,7 +48,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             
             //if the length is zero, then we are in sync, just exit.
             if (_.difference($scope.model.value, selectedVals).length === 0) {
-                debugger;
                 return;
             }
 

From 8ab89f5e1c911feefb73f32f1ea830e7ac51c696 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 22 Mar 2019 12:01:08 +0100
Subject: [PATCH 077/130] https://github.com/umbraco/Umbraco-CMS/issues/4683 -
 Translation in the culture and hostnames panel. Our recommendation in V8 is
 opposite to V7, therefore a new key is introduced

---
 .../src/views/content/assigndomain.html       | 28 +++++++++----------
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml |  2 --
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  7 +++--
 src/Umbraco.Web.UI/Umbraco/config/lang/de.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 11 ++++----
 .../Umbraco/config/lang/en_us.xml             |  9 +++---
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml |  2 --
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  3 --
 src/Umbraco.Web.UI/Umbraco/config/lang/he.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/it.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml |  3 --
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml |  3 --
 src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml |  3 --
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml |  5 ----
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml |  3 --
 .../Umbraco/config/lang/zh_tw.xml             |  3 --
 21 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
index 89381e1be4..10b155111c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
@@ -5,7 +5,7 @@
     <form name="vm.domainForm" ng-submit="vm.save()" novalidate>
 
         <div ng-hide="vm.loading" class="umb-dialog-body">
-            
+
             <umb-pane ng-if="!currentNode.metaData.variesByCulture">
                 <h5 class="umb-pane-title"><localize key="assignDomain_setLanguage">Culture</localize></h5>
                 <label for="assignDomain_language" class="control-label"><localize key="general_language"></localize></label>
@@ -18,14 +18,14 @@
 
                 <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</localize></h5>
                 <small class="db" style="margin-bottom: 10px;">
-                    <localize key="assignDomain_domainHelp"></localize>
+                    <localize key="assignDomain_domainHelpWithVariants"></localize>
                 </small>
                 <div class="umb-el-wrap  hidelabel">
                     <table class="table table-condensed table-bordered domains" style="margin-bottom: 10px;" ng-if="vm.domains.length > 0">
                         <thead>
                             <tr>
                                 <th>
-                                    <localize key="assignDomain_domain"></localize>                    
+                                    <localize key="assignDomain_domain"></localize>
                                     <span class="umb-control-required">*</span>
                                 </th>
                                 <th>
@@ -45,17 +45,17 @@
                                     <span ng-show="domain.duplicate" class="help-inline"><localize key="assignDomain_duplicateDomain"></localize><span ng-show="domain.other">({{domain.other}})</span></span>
                                 </td>
                                 <td>
-                                    <select 
-                                        style="width: 100%; margin-bottom: 0;" 
-                                        name="domain_language_{{$index}}" 
-                                        class="language" 
-                                        ng-model="domain.lang" 
+                                    <select
+                                        style="width: 100%; margin-bottom: 0;"
+                                        name="domain_language_{{$index}}"
+                                        class="language"
+                                        ng-model="domain.lang"
                                         ng-options="lang.name for lang in vm.languages"
                                         required>
                                     </select>
                                 </td>
                                 <td>
-                                    <umb-button 
+                                    <umb-button
                                         icon="icon-trash"
                                         action="vm.removeDomain($index)"
                                         type="button"
@@ -66,8 +66,8 @@
                         </tbody>
                     </table>
                 </div>
-                
-                <umb-button 
+
+                <umb-button
                     label-key="assignDomain_addNew"
                     action="vm.addDomain()"
                     type="button"
@@ -80,14 +80,14 @@
 
         <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
 
-            <umb-button 
+            <umb-button
                 label-key="general_close"
                 action="vm.closeDialog()"
                 type="button"
                 button-style="link">
             </umb-button>
 
-            <umb-button 
+            <umb-button
                 label-key="buttons_save"
                 type="submit"
                 button-style="success"
@@ -97,5 +97,5 @@
         </div>
 
     </form>
-    
+
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 6c685e36e9..42fe9f920b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -47,8 +47,6 @@
     <key alias="domainCreated">Nová doména '%0%' byla vytvořena</key>
     <key alias="domainDeleted">Doména '%0%' je odstraněna</key>
     <key alias="domainExists">Doména '%0%' už byla přiřazena</key>
-    <key alias="domainHelp"><![CDATA[Platná doménová jména jsou: "example.com", "www.example.com", "example.com:8080" nebo
-        "https://www.example.com/".<br /><br />Jednoúrovňové cesty v doménách jsou podporovány, např. "example.com/en". Měli byste se jich nicméně vyvarovat. Raději použijte nastavení kultury výše.]]></key>
     <key alias="domainUpdated">Doména '%0%' byla aktualizována</key>
     <key alias="orEdit">Editace aktuálních domén</key>
     <key alias="inherit">Dědit</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 3dc447cef4..875948d4d2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -95,7 +95,8 @@
     <key alias="domainExists">Domænet '%0%' er oprettet</key>
     <key alias="domainUpdated">Domænet '%0%' er nu opdateret</key>
     <key alias="orEdit">eller rediger nuværende domæner</key>
-    <key alias="domainHelp">f.eks. ditdomaene.com, www.ditdomaene.com</key>
+    <key alias="domainHelpWithVariants"><![CDATA[Gyldige domænenavne er: "example.com", "www.example.com", "example.com:8080" eller "https://www.example.com/".
+     Yderlgiere understøttes også første niveau af stien efter domænet, f.eks. "Example.com/en" eller "/en". ]]></key>
     <key alias="inherit">Nedarv</key>
     <key alias="setLanguage">Sprog</key>
     <key alias="setLanguageHelp"><![CDATA[Indstil sproget for noder under den aktuelle node,<br /> eller nedarv sprog fra forældre noder. Gælder også<br />
@@ -277,7 +278,7 @@
     <key alias="languagesToUnpublish">Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog.</key>
     <key alias="publishedLanguages">Udgivne sprog</key>
     <key alias="unpublishedLanguages">Ikke-udgivne sprog</key>
-    <key alias="unmodifiedLanguages">Uændrede sprog</key>
+    <key alias="unmodifiedLanguages">Uændrede sprog</key>
     <key alias="untouchedLanguagesForFirstTime">Disse sprog er ikke blevet oprettet</key>
     <key alias="readyToPublish">Klar til at udgive?</key>
     <key alias="readyToSave">Klar til at gemme?</key>
@@ -986,7 +987,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="contentPublishedFailedInvalid"><![CDATA[
     %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
     ]]></key>
-    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
+    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan ikke udgives, fordi det mangler et navn.]]></key>
     <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
     <key alias="inProgress">Publicerer - vent venligst...</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index ea4d619690..7e1cb96228 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -52,7 +52,6 @@
     <key alias="domainExists">Die Domain '%0%' ist bereits zugeordnet</key>
     <key alias="domainUpdated">Domain '%0%' aktualisiert</key>
     <key alias="orEdit">Domains bearbeiten</key>
-    <key alias="domainHelp">Beispiel: example.com, www.example.com</key>
     <key alias="inherit">Vererben</key>
     <key alias="setLanguage">Kultur</key>
     <key alias="setLanguageHelp">Definiert die Kultureinstellung für untergeordnete Elemente dieses Elements oder vererbt vom übergeordneten Element. Wird auch auf das aktuelle Element angewendet, sofern auf tieferer Ebene keine Domain zugeordnet ist.</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 1504b092e5..fa6f689845 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -96,9 +96,8 @@
     <key alias="domainExists">Domain '%0%' has already been assigned</key>
     <key alias="domainUpdated">Domain '%0%' has been updated</key>
     <key alias="orEdit">Edit Current Domains</key>
-    <key alias="domainHelp"><![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080" or
-        "https://www.example.com/". One-level paths in domains are supported, eg. "example.com/en". However, they
-        should be avoided. Better use the culture setting above.]]></key>
+      <key alias="domainHelpWithVariants"><![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
     <key alias="inherit">Inherit</key>
     <key alias="setLanguage">Culture</key>
         <key alias="setLanguageHelp">
@@ -287,8 +286,8 @@
     <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
     <key alias="publishedLanguages">Published Languages</key>
     <key alias="unpublishedLanguages">Unpublished Languages</key>
-    <key alias="unmodifiedLanguages">Unmodified Languages</key>
-    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
+    <key alias="unmodifiedLanguages">Unmodified Languages</key>
+    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
     <key alias="readyToPublish">Ready to Publish?</key>
     <key alias="readyToSave">Ready to Save?</key>
     <key alias="sendForApproval">Send for approval</key>
@@ -1236,7 +1235,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     ]]></key>
     <key alias="contentPublishedFailedByParent"><![CDATA[
       %0% can not be published, because a parent page is not published.
-    ]]></key>
+    ]]></key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
     <key alias="includeUnpublished">Include unpublished subpages</key>
     <key alias="inProgress">Publishing in progress - please wait...</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 7f1edf9e7c..6ff4d32f08 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -96,9 +96,8 @@
     <key alias="domainExists">Domain '%0%' has already been assigned</key>
     <key alias="domainUpdated">Domain '%0%' has been updated</key>
     <key alias="orEdit">Edit Current Domains</key>
-    <key alias="domainHelp"><![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080" or
-        "https://www.example.com/". One-level paths in domains are supported, eg. "example.com/en". However, they
-        should be avoided. Better use the culture setting above.]]></key>
+    <key alias="domainHelpWithVariants"><![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
     <key alias="inherit">Inherit</key>
     <key alias="setLanguage">Culture</key>
     <key alias="setLanguageHelp"><![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
@@ -290,7 +289,7 @@
     <key alias="publishedLanguages">Published Languages</key>
     <key alias="unpublishedLanguages">Unpublished Languages</key>
     <key alias="unmodifiedLanguages">Unmodified Languages</key>
-    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
+    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
     <key alias="readyToPublish">Ready to Publish?</key>
     <key alias="readyToSave">Ready to Save?</key>
     <key alias="sendForApproval">Send for approval</key>
@@ -1240,7 +1239,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     ]]></key>
     <key alias="contentPublishedFailedByParent"><![CDATA[
       %0% can not be published, because a parent page is not published.
-    ]]></key>
+    ]]></key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
     <key alias="inProgress">Publishing in progress - please wait...</key>
     <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 9143889f84..aef92af6e1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -86,8 +86,6 @@
     <key alias="domainExists">El dominio'%0%' ya ha sido asignado</key>
     <key alias="domainUpdated">El dominio %0% ha sido actualizado</key>
     <key alias="orEdit">Editar dominios actuales</key>
-    <key alias="domainHelp"><![CDATA[p.ej.: "tudominio.com", "www.tudominio.com", "tudominio.com:8080" o
-        "https://www.tudominio.com/".<br /><br />Los dominios de un nivel están soportados, por ej. "example.com/en". De todas formas deberían de evitarse. Mejor usar la configuración cultural especificada arriba.]]></key>
     <key alias="inherit">Heredar</key>
         <key alias="setLanguage">Idioma</key>
         <key alias="setLanguageHelp">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 9f36971fe0..e992767f4f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -88,9 +88,6 @@
     <key alias="domainExists">Domaine '%0%' déjà assigné</key>
     <key alias="domainUpdated">Domaine '%0%' mis à jour</key>
     <key alias="orEdit">Editer les domaines actuels</key>
-    <key alias="domainHelp"><![CDATA[Les formats de domaines suivants sont autorisés : "example.com", "www.example.com", "example.com:8080" ou
-        "https://www.example.com/".<br /><br />Les domaines contenant un chemin d'un niveau sont autorisés, ex : "example.com/en". Pour autant, cela
-        devrait être évité. Utilisez plutôt la gestion de la culture et des noms d'hôte.]]></key>
     <key alias="inherit">Hériter</key>
     <key alias="setLanguage">Culture</key>
     <key alias="setLanguageHelp"><![CDATA[Définir la culture pour les noeuds enfants du noeud courant,<br /> ou hériter de la culture des noeuds parents. S'appliquera aussi<br />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
index 5a5dd52b6d..a0a6c2cefc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -41,7 +41,6 @@
     <key alias="domainCreated">הדומיין החדש %0% נוסף בהצלחה</key>
     <key alias="domainDeleted">הדומיין %0% נמחק</key>
     <key alias="domainExists">הדומיין %0% כבר מוקצה</key>
-    <key alias="domainHelp">לדוגמא: yourdomain.com, www.yourdomain.com</key>
     <key alias="domainUpdated">הדומיין %0% עודכן בהצלחה</key>
     <key alias="orEdit">ערוך דומיין נוכחי</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
index 285249a3ff..8d8105c4d1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -41,7 +41,6 @@
     <key alias="domainCreated"><![CDATA[Il dominio '%0%' è stato creato]]></key>
     <key alias="domainDeleted"><![CDATA[Il dominio '%0%' è stato cancellato]]></key>
     <key alias="domainExists"><![CDATA[Il dominio '%0%' è già stato assegnato]]></key>
-    <key alias="domainHelp"><![CDATA[per esempio: yourdomain.com, www.yourdomain.com]]></key>
     <key alias="domainUpdated"><![CDATA[Il dominio '%0%' è stato aggiornato]]></key>
     <key alias="invalidDomain">Hostname non valido</key>
     <key alias="orEdit">Modifica il dominio corrente</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index 4264e5d4f7..f6d957743e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -52,7 +52,6 @@
     <key alias="domainExists">ドメイン '%0%' は既に割り当てられています</key>
     <key alias="domainUpdated">ドメイン '%0%' は更新されました</key>
     <key alias="orEdit">ドメインの編集</key>
-    <key alias="domainHelp"><![CDATA[有効なドメイン名は、"example.com"、"www.example.com"、"example.com:8080"、"https://www.example.com/" などです。ドメインで 1 レベル パスがサポートされます。ただし、それらは回避する必要があります。代わりに上記のカルチャ設定を使用してください。]]></key>
     <key alias="inherit">継承</key>
     <key alias="setLanguage">カルチャの割り当て</key>
     <key alias="setLanguageHelp"><![CDATA[現在のノードの下のノードのカルチャを設定または親ノードからカルチャを継承。以下のドメインが適用されない場合、現在のノードにも適用します。]]></key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
index 711eb52c40..2336dccb16 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -40,7 +40,6 @@
     <key alias="domainCreated">새로운 '%0%' 도메인이 생성되었습니다</key>
     <key alias="domainDeleted">'%0%' 도메인이 삭제되었습니다</key>
     <key alias="domainExists">'%0%' 도메인이 이미 존재합니다</key>
-    <key alias="domainHelp">예제: yourdomain.com, www.yourdomain.com</key>
     <key alias="domainUpdated">'%0%' 도메인이 업데이트 되었습니다</key>
     <key alias="orEdit">현재 도메인 수정</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index 5ea42a3f2b..b38c11a6e0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -50,8 +50,7 @@
     <key alias="domainExists">Domenet '%0%' er allerede tilknyttet</key>
     <key alias="domainUpdated">Domenet '%0%' er nå oppdatert</key>
     <key alias="orEdit">eller rediger eksisterende domener</key>
-    <key alias="domainHelp"><![CDATA[Gyldige domenenavn er: "eksempel.no", "www.eksempel.no", "eksempel.no:8080" eller "https://www.eksempel.no/".<br/><br/>Stier med ett nivå støttes, f.eks. "eksempel.com/no". Imidlertid bør det unngås. Bruk heller språkinnstillingen over.]]></key>
-    <key alias="inherit">Arv</key>
+   <key alias="inherit">Arv</key>
     <key alias="setLanguage">Språk</key>
     <key alias="setLanguageHelp"><![CDATA[Sett språk for underordnede noder eller arv språk fra overordnet.<br/>Vil også gjelde denne noden, med mindre et underordnet domene også gjelder.]]></key>
     <key alias="setDomains">Domener</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index ecdb83fea0..28d71ed003 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -55,9 +55,6 @@
     <key alias="domainExists">Domein '%0' is al aanwezig</key>
     <key alias="domainUpdated">Domein '%0%' is bijgewerkt</key>
     <key alias="orEdit">Bewerk huidige domeinen</key>
-    <key alias="domainHelp"><![CDATA[Geldige domeinnamen zijn: "example.com", "www.example.com", "example.com:8080" of
-        "https://www.example.com/".<br /><br />Zgn. 'one-level' paden in domeinen worden ondersteund, bijv. "example.com/en". Echter, ze
-        zouden moeten worden vermeden. Gebruik bij voorkeur de cultuurinstelling hierboven.]]></key>
     <key alias="inherit">Overerven</key>
     <key alias="setLanguage">Cultuur</key>
     <key alias="setLanguageHelp"><![CDATA[Zet de cultuur voor de nodes onder de huidige node,<br /> of erf de cultuur over van de oudernodes. Zal ook van toepassing <br />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 37e1d9829c..96e8e980a6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -86,9 +86,6 @@
     <key alias="domainExists">Domena '%0%' jest aktualnie przypisana</key>
     <key alias="domainUpdated">Domena '%0%' została zaktualizowana</key>
     <key alias="orEdit">Edytuj Aktualne Domeny</key>
-    <key alias="domainHelp"><![CDATA[Poprawne domeny to: "example.com", "www.example.com", "example.com:8080" lub
-    "https://www.example.com/". Wspierane są jednopoziomowe ścieżki domen, np. "example.com/en" jednakże powinno się ich unikać.
-    Preferowane jest użycie powyższych ustawień języka.]]></key>
     <key alias="inherit">Odziedziczona</key>
     <key alias="setLanguage">Język</key>
     <key alias="setLanguageHelp"><![CDATA[Wybierz język dla węzła,<br /> lub wybierz dziedziczenie języka z węzła rodzica. Zostanie to zastosowane<br />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
index eb87077572..a275fc8cd9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
@@ -40,7 +40,6 @@
     <key alias="domainCreated">Novo domínio '%0%' foi criado</key>
     <key alias="domainDeleted">Domínio '%0%' foi removido</key>
     <key alias="domainExists">Domínio '%0%' já foi designado</key>
-    <key alias="domainHelp">ou seja: seudominio.com, www.seudominio.com</key>
     <key alias="domainUpdated">Domínio '%0%' foi atualizado</key>
     <key alias="orEdit">Editar Domínios Atuais</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index a3ba12fea5..a0fc2c3ffc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -78,9 +78,6 @@
     <key alias="domainCreated">Создан новый домен '%0%'</key>
     <key alias="domainDeleted">Домен '%0%' удален</key>
     <key alias="domainExists">Домен с именем '%0%' уже существует</key>
-    <key alias="domainHelp"><![CDATA[Примеры допустимых доменных имен: "example.com", "www.example.com", "example.com:8080" или
-        "https://www.example.com/".<br /><br />Также здесь допустимы части адресов URL первого уровня, например "example.com/en",
-        однако их следует по возможности избегать. Рекомендуется использовать настройку культуры (языка), расположенную выше.]]></key>
     <key alias="domainUpdated">Домен '%0%' обновлен</key>
     <key alias="duplicateDomain">Такой домен уже назначен.</key>
     <key alias="inherit">Унаследовать</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 158cdeb9cb..9e2e312c38 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -43,7 +43,6 @@
     <key alias="domainCreated">Har skapat domännamnet %0%</key>
     <key alias="domainDeleted">Har tagit bort domännamnet %0%</key>
     <key alias="domainExists">Domänen %0% är redan tillagd</key>
-    <key alias="domainHelp">t.ex.: dittdomannamn.se, www.dittdomannamn.se</key>
     <key alias="domainUpdated">Domännamnet %0% har uppdaterats</key>
     <key alias="duplicateDomain">Domänen är redan tilldelad</key>
     <key alias="inherit">Ärv</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 2d3f24c113..1a298c0a35 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -52,11 +52,6 @@
     <key alias="domainExists">Domain '%0%' zaten atanmış</key>
     <key alias="domainUpdated">Domain '%0%' güncellendi</key>
     <key alias="orEdit">Geçerli domain düzenle</key>
-    <key alias="domainHelp"><![CDATA[
-    Geçerli alan adları şunlardır : " umbraco.com ", " www.umbraco.com ", " umbraco.com:8080 " ya da
-        " https://www.umbraco.com/ " . <br /> etki /> bir düzey yollar desteklenir <br , örneğin . " umbraco.com/en " . Bununla birlikte,
-        kaçınılmalıdır. Daha yukarıdaki kültür ayarını kullanın
-    ]]></key>
     <key alias="inherit">Miras Al</key>
     <key alias="setLanguage">Kültür</key>
     <key alias="setLanguageHelp"><![CDATA[Geçerli düğümün altındaki düğümler için kültür Set <br /> veya üst düğümleri kültürünü devralır. Ayrıca <br /> geçerli olacaktır
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index dcf84f41ca..c8c3f75e17 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -55,9 +55,6 @@
     <key alias="domainExists">域名 '%0%' 已使用</key>
     <key alias="domainUpdated">域名 '%0%' 已更新</key>
     <key alias="orEdit">编辑当前域名</key>
-    <key alias="domainHelp"><![CDATA[例如：example.com、www.example.com、example.com:8080、<br/>
-        https://www.example.com/、example.com/en、……使用 * 代表任意域名，<br/>
-        只需要设置语言部分即可。]]></key>
     <key alias="inherit">继承</key>
     <key alias="setLanguage">语言</key>
     <key alias="setLanguageHelp"><![CDATA[为当前节点及子节点设置语言，<br />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 568af00c24..56639aa308 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -52,9 +52,6 @@
     <key alias="domainExists">功能變數名稱 '%0%' 已使用</key>
     <key alias="domainUpdated">功能變數名稱 '%0%' 已更新</key>
     <key alias="orEdit">編輯當前功能變數名稱</key>
-    <key alias="domainHelp"><![CDATA[合格的網域名稱："example.com"，"www.example.com"，"example.com:8080" 或
-        "https://www.example.com/"。也可以使用一層路徑，如： "example.com/en"。但是，最好避免。
-        建議使用上面的文化設定。]]></key>
     <key alias="inherit">繼承</key>
     <key alias="setLanguage">語言</key>
     <key alias="setLanguageHelp"><![CDATA[改變目前節點以下其餘節點的文化設定，<br />或從父節點繼承文化設定。<br />

From f99d3f74197235511c94cf4ef2de92878b86ba68 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 22 Mar 2019 13:53:40 +0100
Subject: [PATCH 078/130] https://github.com/umbraco/Umbraco-CMS/issues/4990 -
 Added skip and take

---
 .../Repositories/Implement/DocumentRepository.cs            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index fcc8402265..53d9474fb0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -230,9 +230,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var sql = GetBaseQuery(QueryType.Many, false)
                 .Where<NodeDto>(x => x.NodeId == nodeId)
                 .OrderByDescending<ContentVersionDto>(x => x.Current)
-                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
-
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true);
+                .AndByDescending<ContentVersionDto>(x => x.VersionDate)
+                ;
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true).Skip(skip).Take(take);
         }
 
         public override IContent GetVersion(int versionId)

From acf59dc1d001e47e1b2b3bdd4c441097bbc7b087 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 22 Mar 2019 13:55:46 +0100
Subject: [PATCH 079/130] Formatting

---
 .../Persistence/Repositories/Implement/DocumentRepository.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 53d9474fb0..6c08e05995 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -230,8 +230,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var sql = GetBaseQuery(QueryType.Many, false)
                 .Where<NodeDto>(x => x.NodeId == nodeId)
                 .OrderByDescending<ContentVersionDto>(x => x.Current)
-                .AndByDescending<ContentVersionDto>(x => x.VersionDate)
-                ;
+                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
+
             return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true).Skip(skip).Take(take);
         }
 

From d107289a0892d6c23599cfedd2e4e80063fc1745 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Fri, 22 Mar 2019 15:06:09 +0100
Subject: [PATCH 080/130] Fixes not being able to add languages

---
 src/Umbraco.Web/Editors/LanguageController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs
index e1c0c61303..61d4d6939f 100644
--- a/src/Umbraco.Web/Editors/LanguageController.cs
+++ b/src/Umbraco.Web/Editors/LanguageController.cs
@@ -105,7 +105,7 @@ namespace Umbraco.Web.Editors
 
             // the localization service might return the generic language even when queried for specific ones (e.g. "da" when queried for "da-DK")
             // - we need to handle that explicitly
-            if (existing.IsoCode != language.IsoCode)
+            if (existing?.IsoCode != language.IsoCode)
             {
                 existing = null;
             }

From 019ac523098f79361e5ecd93d585212903912760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:06:07 +0100
Subject: [PATCH 081/130] emit "editors.dataTypeSettings.saved"-event

---
 .../datatypesettings.controller.js            | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
index 099439fa4b..46a4238c0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
@@ -10,7 +10,8 @@
 (function () {
     "use strict";
 
-    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, localizationService, notificationsService, overlayService, formHelper) {
+    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, 
+        localizationService, notificationsService, overlayService, formHelper, eventsService) {
 
         var vm = this;
 
@@ -103,27 +104,33 @@
 
             var preValues = dataTypeHelper.createPreValueProps(vm.dataType.preValues);
             
-            dataTypeResource.save(vm.dataType, preValues, $scope.model.create).then(function(newDataType) {
-                $scope.model.dataType = newDataType;
-                vm.saveButtonState = "success";
+            dataTypeResource.save(vm.dataType, preValues, $scope.model.create).then(
+                function(newDataType) {
+                    $scope.model.dataType = newDataType;
+                    
+                    var args = { dataType: newDataType };
+                    eventsService.emit("editors.dataTypeSettings.saved", args);
+                    
+                    vm.saveButtonState = "success";
 
-                if ($scope.model && $scope.model.submit) {
-                    $scope.model.submit($scope.model);
-                }
-            }, function(err) {
-                vm.saveButtonState = "error";
-     
-                 if(err.status === 400) {
-                    if (err.data && (err.data.ModelState)) {
-                        
-                        formHelper.handleServerValidation(err.data.ModelState);
+                    if ($scope.model && $scope.model.submit) {
+                        $scope.model.submit($scope.model);
+                    }
+                }, function(err) {
+                    vm.saveButtonState = "error";
+                    
+                    if(err.status === 400) {
+                        if (err.data && (err.data.ModelState)) {
+                            
+                            formHelper.handleServerValidation(err.data.ModelState);
 
-                        for (var e in err.data.ModelState) {
-                            notificationsService.error("Validation", err.data.ModelState[e][0]);
+                            for (var e in err.data.ModelState) {
+                                notificationsService.error("Validation", err.data.ModelState[e][0]);
+                            }
                         }
                     }
                 }
-            });
+            );
             
         }
 

From af4dc97b10505848e519535f32562a31de3acf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:06:39 +0100
Subject: [PATCH 082/130] changed ' to "

---
 .../components/content/umbcontentnodeinfo.directive.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index d4b617f94b..e58ff14e21 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -147,7 +147,7 @@
                     id: documentType.id,
                     submit: function (model) {
                         const args = { node: scope.node };
-                        eventsService.emit('editors.content.reload', args);
+                        eventsService.emit("editors.content.reload", args);
                         editorService.close();
                     },
                     close: function () {

From da503cc9b5730cb01611dbe16761956215b3bb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:19:56 +0100
Subject: [PATCH 083/130] listen for "editors.dataTypeSettings.saved"

---
 .../components/umbgroupsbuilder.directive.js  | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 15f5a1d46a..da51528bd2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -1,13 +1,17 @@
 (function() {
   'use strict';
 
-  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout, notificationsService, localizationService, editorService) {
+  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, 
+      dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout, notificationsService, 
+      localizationService, editorService, eventsService) {
     
     function link(scope, el, attr, ctrl) {
-
+        
+        var eventBindings = [];
         var validationTranslated = "";
         var tabNoSortOrderTranslated = "";
 
+      scope.dataTypeHasChanged = false;
       scope.sortingMode = false;
       scope.toolbar = [];
       scope.sortableOptionsGroup = {};
@@ -613,18 +617,44 @@
           });
         });
       }
-
-
-      var unbindModelWatcher = scope.$watch('model', function(newValue, oldValue) {
-        if (newValue !== undefined && newValue.groups !== undefined) {
-          activate();
+      
+        function hasPropertyOfDataTypeId(dataTypeId) {
+            
+            // look at each property
+            var result = _.filter(scope.model.groups, function(group) {
+                return _.filter(group.properties, function(property) {
+                    return (property.dataTypeId === dataTypeId);
+                });
+            });
+            
+            return (result.length > 0);
         }
-      });
 
-      // clean up
-      scope.$on('$destroy', function(){
-        unbindModelWatcher();
-      });
+
+        eventBindings.push(scope.$watch('model', function(newValue, oldValue) {
+            if (newValue !== undefined && newValue.groups !== undefined) {
+                activate();
+            }
+        }));
+        
+        // clean up
+        eventBindings.push(eventsService.on("editors.dataTypeSettings.saved", function (name, args) {
+            if(hasPropertyOfDataTypeId(args.dataType.id)) {
+                scope.dataTypeHasChanged = true;
+            }
+        }));
+        
+        // clean up
+        eventBindings.push(scope.$on('$destroy', function() {
+            for(var e in eventBindings) {
+                eventBindings[e]();
+            }
+            // if a dataType has changed, we want to notify which properties that are affected by this dataTypeSettings change
+            if(scope.dataTypeHasChanged === true) {
+                var args = {documentType: scope.model};
+                eventsService.emit("editors.documentType.saved", args);
+            }
+        }));
 
     }
 

From d806855698d374378bae65878cb4c006d76eb22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:22:36 +0100
Subject: [PATCH 084/130] listen for "editors.documentType.saved" instead of
 "editors.content.reload"

---
 .../components/content/edit.controller.js        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 80b5f4ed39..a7ce013bc3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -116,6 +116,13 @@
         function isContentCultureVariant() {
             return $scope.content.variants.length > 1;
         }
+        
+        function reload() {
+            $scope.page.loading = true;
+            loadContent().then(function() {
+                $scope.page.loading = false;
+            });
+        }
 
         function bindEvents() {
             //bindEvents can be called more than once and we don't want to have multiple bound events
@@ -123,13 +130,10 @@
                 eventsService.unsubscribe(evts[e]);
             }
 
-            evts.push(eventsService.on("editors.content.reload", function (name, args) {
+            evts.push(eventsService.on("editors.documentType.saved", function (name, args) {
                 // if this content item uses the updated doc type we need to reload the content item
-                if(args && args.node && args.node.key === $scope.content.key) {
-                    $scope.page.loading = true;
-                    loadContent().then(function() {
-                        $scope.page.loading = false;
-                    });
+                if(args && args.documentType && $scope.content.documentType.id === args.documentType.id) {
+                    reload();
                 }
             }));
 

From 080f4331402dca888c4867d774d79abfd1640e6d Mon Sep 17 00:00:00 2001
From: Brandon Osborne <brandon.osborne@coderpro.net>
Date: Sat, 23 Mar 2019 03:59:04 -0500
Subject: [PATCH 085/130] Updated Upload method  (#4850)

---
 src/Umbraco.Web/Editors/ContentTypeController.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index bf2ef62028..1f00b88b6d 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -552,9 +552,15 @@ namespace Umbraco.Web.Editors
             var file = result.FileData[0];
             var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
             var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
+
+            // renaming the file because MultipartFormDataStreamProvider has created a random fileName instead of using the name from the
+            // content-disposition for more than 6 years now. Creating a CustomMultipartDataStreamProvider deriving from MultipartFormDataStreamProvider
+            // seems like a cleaner option, but I'm not sure where to put it and renaming only takes one line of code.
+            System.IO.File.Move(result.FileData[0].LocalFileName, root + "\\" + fileName);
+
             if (ext.InvariantEquals("udt"))
             {
-                model.TempFileName = Path.Combine(root, model.TempFileName);
+                model.TempFileName = Path.Combine(root, fileName);
 
                 model.UploadedFiles.Add(new ContentPropertyFile
                 {

From 4e1634754ba46dd571fb8dae9cf8dd096c634fed Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Sat, 23 Mar 2019 19:29:46 +1000
Subject: [PATCH 086/130] fix URL redirection creation - was failing when save
 and save+publish as save creates new URL, which is compared to itself in
 save+publish (#5036)

---
 .../Routing/RedirectTrackingEventHandler.cs            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
index 75cce71f73..d032be2795 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
@@ -177,11 +177,13 @@ namespace Umbraco.Web.Routing
                     // change the IUrlSegmentProvider to support being able to determine if a
                     // segment is going to change for an entity. See notes in IUrlSegmentProvider.
 
-                    var oldEntity = ApplicationContext.Current.Services.ContentService.GetById(entity.Id);
-                    if (oldEntity == null) continue;
-                    var oldSegment = oldEntity.GetUrlSegment();
+                    // we want the last published version, not the last saved
+                    // otherwise redirects aren't created if content is saved, with save+publish happening later
+                    var publishedEntity = ApplicationContext.Current.Services.ContentService.GetPublishedVersion(entity.Id);
+                    if (publishedEntity == null) continue;
+                    var publishedSegment = publishedEntity.GetUrlSegment();
                     var newSegment = entity.GetUrlSegment();
-                    process = oldSegment != newSegment;
+                    process = publishedSegment != newSegment;
                 }
 
                 // skip if no segment change

From bf3ce014cb50a62d6c964ac5cda32af68d35a668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 10:51:06 +0100
Subject: [PATCH 087/130] changed button styles for a better low hanging-fruit
 solution

---
 .../src/views/dashboard/content/redirecturls.html           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
index 98a8294e80..0f08897501 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
@@ -13,7 +13,8 @@
                     type="button"
                     size="s"
                     action="vm.disableUrlTracker($event)"
-                    label-key="redirectUrls_disableUrlTracker">
+                    label-key="redirectUrls_disableUrlTracker"
+                    button-style="white">
                 </umb-button>
 
                 <umb-button
@@ -22,7 +23,8 @@
                     size="s"
                     button-style="success"
                     action="vm.enableUrlTracker()"
-                    label-key="redirectUrls_enableUrlTracker">
+                    label-key="redirectUrls_enableUrlTracker"
+                    button-style="success">
                 </umb-button>
 
             </umb-editor-sub-header-section>

From 026ad4f2a8b0e6c3df50cbe2b89183409d6f08c2 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Mon, 25 Mar 2019 11:07:50 +0100
Subject: [PATCH 088/130] fixes - TinyMCE does not sync data to angular store
 when dragged away in grid-editor (#5048)

---
 .../src/views/components/grid/grid-rte.html   |    4 +-
 .../propertyeditors/grid/grid.controller.js   | 1831 +++++++++--------
 .../src/views/propertyeditors/grid/grid.html  |   31 +-
 3 files changed, 933 insertions(+), 933 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
index f3b854a062..889c4133d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
@@ -1,3 +1,3 @@
-<div class="umb-rte">
-    <div id="{{uniqueId}}"></div>
+<div class="umb-rte"
+     id="{{uniqueId}}">
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index e5a9711458..c23c2cd212 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -1,953 +1,954 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridController",
-    function (
-        $scope,
-        localizationService,
-        gridService,
-        $timeout,
-        umbRequestHelper,
-        angularHelper,
-        $element,
-        eventsService
-    ) {
+        function (
+            $scope,
+            localizationService,
+            gridService,
+            umbRequestHelper,
+            angularHelper,
+            $element,
+            eventsService
+        ) {
 
-        // Grid status variables
-        var placeHolder = "";
-        var currentForm = angularHelper.getCurrentForm($scope);
+            // Grid status variables
+            var placeHolder = "";
+            var currentForm = angularHelper.getCurrentForm($scope);
 
-        $scope.currentRow = null;
-        $scope.currentCell = null;
-        $scope.currentToolsControl = null;
-        $scope.currentControl = null;
-        $scope.openRTEToolbarId = null;
-        $scope.hasSettings = false;
-        $scope.showRowConfigurations = true;
-        $scope.sortMode = false;
-        $scope.reorderKey = "general_reorder";
+            $scope.currentRow = null;
+            $scope.currentCell = null;
+            $scope.currentToolsControl = null;
+            $scope.currentControl = null;
+            $scope.openRTEToolbarId = null;
+            $scope.hasSettings = false;
+            $scope.showRowConfigurations = true;
+            $scope.sortMode = false;
+            $scope.reorderKey = "general_reorder";
 
-        // *********************************************
-        // Sortable options
-        // *********************************************
+            // *********************************************
+            // Sortable options
+            // *********************************************
 
-        var draggedRteSettings;
+            var draggedRteSettings;
 
-        $scope.sortableOptionsRow = {
-            distance: 10,
-            cursor: "move",
-            placeholder: "ui-sortable-placeholder",
-            handle: ".umb-row-title-bar",
-            helper: "clone",
-            forcePlaceholderSize: true,
-            tolerance: "pointer",
-            zIndex: 999999999999999999,
-            scrollSensitivity: 100,
-            cursorAt: {
-                top: 40,
-                left: 60
-            },
+            $scope.sortableOptionsRow = {
+                distance: 10,
+                cursor: "move",
+                placeholder: "ui-sortable-placeholder",
+                handle: ".umb-row-title-bar",
+                helper: "clone",
+                forcePlaceholderSize: true,
+                tolerance: "pointer",
+                zIndex: 999999999999999999,
+                scrollSensitivity: 100,
+                cursorAt: {
+                    top: 40,
+                    left: 60
+                },
 
-            sort: function (event, ui) {
-                /* prevent vertical scroll out of the screen */
-                var max = $(".umb-grid").width() - 150;
-                if (parseInt(ui.helper.css("left")) > max) {
-                    ui.helper.css({ "left": max + "px" });
+                sort: function (event, ui) {
+                    /* prevent vertical scroll out of the screen */
+                    var max = $(".umb-grid").width() - 150;
+                    if (parseInt(ui.helper.css("left")) > max) {
+                        ui.helper.css({ "left": max + "px" });
+                    }
+                    if (parseInt(ui.helper.css("left")) < 20) {
+                        ui.helper.css({ "left": 20 });
+                    }
+                },
+
+                start: function (e, ui) {
+
+                    // Fade out row when sorting
+                    ui.item[0].style.display = "block";
+                    ui.item[0].style.opacity = "0.5";
+
+                    draggedRteSettings = {};
+                    ui.item.find(".umb-rte").each(function (key, value) {
+                        // remove all RTEs in the dragged row and save their settings
+                        var rteId = value.id;
+                        draggedRteSettings[rteId] = _.findWhere(tinyMCE.editors, { id: rteId }).settings;
+                    });
+                },
+
+                stop: function (e, ui) {
+
+                    // Fade in row when sorting stops
+                    ui.item[0].style.opacity = "1";
+
+                    // reset all RTEs affected by the dragging
+                    ui.item.parents(".umb-column").find(".umb-rte").each(function (key, value) {
+                        var rteId = value.id;
+                        draggedRteSettings[rteId] = draggedRteSettings[rteId] || _.findWhere(tinyMCE.editors, { id: rteId }).settings;
+                        tinyMCE.execCommand("mceRemoveEditor", false, rteId);
+                        tinyMCE.init(draggedRteSettings[rteId]);
+                    });
+                    currentForm.$setDirty();
                 }
-                if (parseInt(ui.helper.css("left")) < 20) {
-                    ui.helper.css({ "left": 20 });
-                }
-            },
+            };
 
-            start: function (e, ui) {
+            var notIncludedRte = [];
+            var cancelMove = false;
+            var startingArea;
+            $scope.sortableOptionsCell = {
+                distance: 10,
+                cursor: "move",
+                uiFloating: true,
+                placeholder: "ui-sortable-placeholder",
+                handle: ".umb-control-handle",
+                helper: "clone",
+                connectWith: ".umb-cell-inner",
+                forcePlaceholderSize: true,
+                tolerance: "pointer",
+                zIndex: 999999999999999999,
+                scrollSensitivity: 100,
+                cursorAt: {
+                    top: 45,
+                    left: 90
+                },
 
-                // Fade out row when sorting
-                ui.item[0].style.display = "block";
-                ui.item[0].style.opacity = "0.5";
+                sort: function (event, ui) {
 
-                draggedRteSettings = {};
-                ui.item.find(".mceNoEditor").each(function () {
-                    // remove all RTEs in the dragged row and save their settings
-                    var id = $(this).attr("id");
-                    draggedRteSettings[id] = _.findWhere(tinyMCE.editors, { id: id }).settings;
-                    // tinyMCE.execCommand("mceRemoveEditor", false, id);
-                });
-            },
+                    /* prevent vertical scroll out of the screen */
+                    var position = parseInt(ui.item.parent().offset().left) + parseInt(ui.helper.css("left")) - parseInt($(".umb-grid").offset().left);
+                    var max = $(".umb-grid").width() - 220;
+                    if (position > max) {
+                        ui.helper.css({ "left": max - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
+                    }
+                    if (position < 0) {
+                        ui.helper.css({ "left": 0 - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
+                    }
+                },
 
-            stop: function (e, ui) {
+                over: function (event, ui) {
 
-                // Fade in row when sorting stops
-                ui.item[0].style.opacity = "1";
+                    var area = event.target.getScope_HackForSortable().area;
+                    var allowedEditors = area.allowed;
 
-                // reset all RTEs affected by the dragging
-                ui.item.parents(".umb-column").find(".mceNoEditor").each(function () {
-                    var id = $(this).attr("id");
-                    draggedRteSettings[id] = draggedRteSettings[id] || _.findWhere(tinyMCE.editors, { id: id }).settings;
-                    tinyMCE.execCommand("mceRemoveEditor", false, id);
-                    tinyMCE.init(draggedRteSettings[id]);
-                });
-                currentForm.$setDirty();
-            }
-        };
-
-        var notIncludedRte = [];
-        var cancelMove = false;
-        var startingArea;
-
-        $scope.sortableOptionsCell = {
-            distance: 10,
-            cursor: "move",
-            placeholder: "ui-sortable-placeholder",
-            handle: ".umb-control-handle",
-            helper: "clone",
-            connectWith: ".umb-cell-inner",
-            forcePlaceholderSize: true,
-            tolerance: "pointer",
-            zIndex: 999999999999999999,
-            scrollSensitivity: 100,
-            cursorAt: {
-                top: 45,
-                left: 90
-            },
-
-            sort: function (event, ui) {
-
-                /* prevent vertical scroll out of the screen */
-                var position = parseInt(ui.item.parent().offset().left) + parseInt(ui.helper.css("left")) - parseInt($(".umb-grid").offset().left);
-                var max = $(".umb-grid").width() - 220;
-                if (position > max) {
-                    ui.helper.css({ "left": max - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
-                }
-                if (position < 0) {
-                    ui.helper.css({ "left": 0 - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
-                }
-            },
-
-            over: function (event, ui) {
-                
-                var area = event.target.getScope_HackForSortable().area;
-                var allowedEditors = area.allowed;
-                
-                if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
+                    if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
                         (startingArea != area && area.maxItems != '' && area.maxItems > 0 && area.maxItems < area.controls.length + 1)) {
 
-                    $scope.$apply(function () {
-                        event.target.getScope_HackForSortable().area.dropNotAllowed = true;
-                    });
-
-                    ui.placeholder.hide();
-                    cancelMove = true;
-                }
-                else {
-                    if (event.target.getScope_HackForSortable().area.controls.length == 0){
-
                         $scope.$apply(function () {
-                            event.target.getScope_HackForSortable().area.dropOnEmpty = true;
+                            event.target.getScope_HackForSortable().area.dropNotAllowed = true;
                         });
+
                         ui.placeholder.hide();
-                    } else {
-                        ui.placeholder.show();
-                    }
-                    cancelMove = false;
-                }
-            },
-
-            out: function(event, ui) {
-                $scope.$apply(function () {
-                    var dropArea = event.target.getScope_HackForSortable().area;
-                    dropArea.dropNotAllowed = false;
-                    dropArea.dropOnEmpty = false;
-                });
-            },
-
-            update: function (event, ui) {
-                /* add all RTEs which are affected by the dragging */
-                if (!ui.sender) {
-                    if (cancelMove) {
-                        ui.item.sortable.cancel();
-                    }
-                    ui.item.parents(".umb-cell.content").find(".mceNoEditor").each(function () {
-                        if ($.inArray($(this).attr("id"), notIncludedRte) < 0) {
-                            notIncludedRte.splice(0, 0, $(this).attr("id"));
-                        }
-                    });
-                }
-                else {
-                    $(event.target).find(".mceNoEditor").each(function () {
-                        if ($.inArray($(this).attr("id"), notIncludedRte) < 0) {
-                            notIncludedRte.splice(0, 0, $(this).attr("id"));
-                        }
-                    });
-                }
-                currentForm.$setDirty();
-            },
-
-            start: function (event, ui) {
-                //Get the starting area for reference
-                var area = event.target.getScope_HackForSortable().area;
-                startingArea = area;
-
-                // fade out control when sorting
-                ui.item[0].style.display = "block";
-                ui.item[0].style.opacity = "0.5";
-
-                // reset dragged RTE settings in case a RTE isn't dragged
-                draggedRteSettings = undefined;
-                ui.item[0].style.display = "block";
-                ui.item.find(".mceNoEditor").each(function () {
-                    notIncludedRte = [];
-                    var editors = _.findWhere(tinyMCE.editors, { id: $(this).attr("id") });
-
-                    // save the dragged RTE settings
-                    if(editors) {
-                        draggedRteSettings = editors.settings;
-
-                        // remove the dragged RTE
-                        tinyMCE.execCommand("mceRemoveEditor", false, $(this).attr("id"));
-
-                    }
-
-                });
-            },
-
-            stop: function (event, ui) {
-
-                // Fade in control when sorting stops
-                ui.item[0].style.opacity = "1";
-
-                ui.item.offsetParent().find(".mceNoEditor").each(function () {
-                    if ($.inArray($(this).attr("id"), notIncludedRte) < 0) {
-                        // add all dragged's neighbouring RTEs in the new cell
-                        notIncludedRte.splice(0, 0, $(this).attr("id"));
-                    }
-                });
-                $timeout(function () {
-                    // reconstruct the dragged RTE (could be undefined when dragging something else than RTE)
-                    if (draggedRteSettings !== undefined) {
-                        tinyMCE.init(draggedRteSettings);
-                    }
-
-                    _.forEach(notIncludedRte, function (id) {
-                        // reset all the other RTEs
-                        if (draggedRteSettings === undefined || id !== draggedRteSettings.id) {
-                            var rteSettings = _.findWhere(tinyMCE.editors, { id: id }).settings;
-                            tinyMCE.execCommand("mceRemoveEditor", false, id);
-                            tinyMCE.init(rteSettings);
-                        }
-                    });
-                }, 500, false);
-
-                $scope.$apply(function () {
-
-                    var cell = event.target.getScope_HackForSortable().area;
-                    cell.hasActiveChild = hasActiveChild(cell, cell.controls);
-                    cell.active = false;
-                });
-            }
-
-        };
-
-        $scope.toggleSortMode = function() {
-            $scope.sortMode = !$scope.sortMode;
-            if($scope.sortMode) {
-                $scope.reorderKey = "general_reorderDone";
-            } else {
-                $scope.reorderKey = "general_reorder";
-            }
-        };
-
-        $scope.showReorderButton = function() {
-            if($scope.model.value && $scope.model.value.sections) {
-                for(var i = 0; $scope.model.value.sections.length > i; i++) {
-                    var section = $scope.model.value.sections[i];
-                    if(section.rows && section.rows.length > 0) {
-                        return true;
-                    }
-                }
-            }
-        };
-
-        // *********************************************
-        // Add items overlay menu
-        // *********************************************
-       $scope.openEditorOverlay = function(event, area, index, key) {
-            var title = "";
-            localizationService.localize("grid_insertControl").then(function(value){
-                title = value;
-                $scope.editorOverlay = {
-                    view: "itempicker",
-                    filter: area.$allowedEditors.length > 15,
-                    title: title,
-                    availableItems: area.$allowedEditors,
-                    event: event,
-                    show: true,
-                    submit: function(model) {
-                      if (model.selectedItem) {
-                        $scope.addControl(model.selectedItem, area, index);
-                        $scope.editorOverlay.show = false;
-                        $scope.editorOverlay = null;
-                      }
-                    }
-                };
-            });
-       };
-
-        // *********************************************
-        // Template management functions
-        // *********************************************
-
-        $scope.addTemplate = function (template) {
-            $scope.model.value = angular.copy(template);
-
-            //default row data
-            _.forEach($scope.model.value.sections, function (section) {
-                $scope.initSection(section);
-            });
-        };
-
-
-        // *********************************************
-        // Row management function
-        // *********************************************
-
-        $scope.clickRow = function(index, rows) {
-            rows[index].active = true;
-        };
-
-        $scope.clickOutsideRow = function(index, rows) {
-            rows[index].active = false;
-        };
-
-        function getAllowedLayouts(section) {
-
-            var layouts = $scope.model.config.items.layouts;
-
-            //This will occur if it is a new section which has been
-            // created from a 'template'
-            if (section.allowed && section.allowed.length > 0) {
-                return _.filter(layouts, function (layout) {
-                    return _.indexOf(section.allowed, layout.name) >= 0;
-                });
-            }
-            else {
-
-
-                return layouts;
-            }
-        }
-
-        $scope.addRow = function (section, layout, isInit) {
-
-            //copy the selected layout into the rows collection
-            var row = angular.copy(layout);
-
-            // Init row value
-            row = $scope.initRow(row);
-
-            // Push the new row
-            if (row) {
-                section.rows.push(row);
-            }
-            if (!isInit) {
-                currentForm.$setDirty();
-            }
-
-            $scope.showRowConfigurations = false;
-
-            eventsService.emit("grid.rowAdded", { scope: $scope, element: $element, row: row });
-
-        };
-
-        $scope.removeRow = function (section, $index) {
-            if (section.rows.length > 0) {
-                section.rows.splice($index, 1);
-                $scope.currentRow = null;
-                $scope.openRTEToolbarId = null;
-                currentForm.$setDirty();
-            }
-
-            if(section.rows.length === 0) {
-               $scope.showRowConfigurations = true;
-            }
-        };
-
-        var shouldApply = function(item, itemType, gridItem) {
-            if (item.applyTo === undefined || item.applyTo === null || item.applyTo === "") {
-                return true;
-            }
-
-            if (typeof (item.applyTo) === "string") {
-                return item.applyTo === itemType;
-            }
-
-            if (itemType === "row") {
-                if (item.applyTo.row === undefined) {
-                    return false;
-                }
-                if (item.applyTo.row === null || item.applyTo.row === "") {
-                    return true;
-                }
-                var rows = item.applyTo.row.split(',');
-                return _.indexOf(rows, gridItem.name) !== -1;
-            } else if (itemType === "cell") {
-                if (item.applyTo.cell === undefined) {
-                    return false;
-                }
-                if (item.applyTo.cell === null || item.applyTo.cell === "") {
-                    return true;
-                }
-                var cells = item.applyTo.cell.split(',');
-                var cellSize = gridItem.grid.toString();
-                return _.indexOf(cells, cellSize) !== -1;
-            }
-        }
-
-        $scope.editGridItemSettings = function (gridItem, itemType) {
-            
-            placeHolder = "{0}";
-
-            var styles, config;
-            if (itemType === 'control') {
-                styles = null;
-                config = angular.copy(gridItem.editor.config.settings);
-            } else {
-                styles = _.filter(angular.copy($scope.model.config.items.styles), function (item) { return shouldApply(item, itemType, gridItem); });
-                config = _.filter(angular.copy($scope.model.config.items.config), function (item) { return shouldApply(item, itemType, gridItem); });
-            }
-
-            if(angular.isObject(gridItem.config)){
-                _.each(config, function(cfg){
-                    var val = gridItem.config[cfg.key];
-                    if(val){
-                        cfg.value = stripModifier(val, cfg.modifier);
-                    }
-                });
-            }
-
-            if(angular.isObject(gridItem.styles)){
-                _.each(styles, function(style){
-                    var val = gridItem.styles[style.key];
-                    if(val){
-                        style.value = stripModifier(val, style.modifier);
-                    }
-                });
-            }
-
-            $scope.gridItemSettingsDialog = {};
-            $scope.gridItemSettingsDialog.view = "views/propertyeditors/grid/dialogs/config.html";
-            $scope.gridItemSettingsDialog.title = "Settings";
-            $scope.gridItemSettingsDialog.styles = styles;
-            $scope.gridItemSettingsDialog.config = config;
-
-            $scope.gridItemSettingsDialog.show = true;
-
-            $scope.gridItemSettingsDialog.submit = function(model) {
-
-                var styleObject = {};
-                var configObject = {};
-
-                _.each(model.styles, function(style){
-                    if(style.value){
-                        styleObject[style.key] = addModifier(style.value, style.modifier);
-                    }
-                });
-                _.each(model.config, function (cfg) {
-                    if (cfg.value) {
-                        configObject[cfg.key] = addModifier(cfg.value, cfg.modifier);
-                    }
-                });
-
-                gridItem.styles = styleObject;
-                gridItem.config = configObject;
-                gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
-
-                currentForm.$setDirty();
-
-                $scope.gridItemSettingsDialog.show = false;
-                $scope.gridItemSettingsDialog = null;
-            };
-
-            $scope.gridItemSettingsDialog.close = function(oldModel) {
-                $scope.gridItemSettingsDialog.show = false;
-                $scope.gridItemSettingsDialog = null;
-            };
-
-        };
-
-        function stripModifier(val, modifier) {
-            if (!val || !modifier || modifier.indexOf(placeHolder) < 0) {
-                return val;
-            } else {
-                var paddArray = modifier.split(placeHolder);
-                if(paddArray.length == 1){
-                    if (modifier.indexOf(placeHolder) === 0) {
-                        return val.slice(0, -paddArray[0].length);
-                    } else {
-                        return val.slice(paddArray[0].length, 0);
-                    }
-                } else {
-                    if (paddArray[1].length === 0) {
-                        return val.slice(paddArray[0].length);
-                    }
-                    return val.slice(paddArray[0].length, -paddArray[1].length);
-                }
-            }
-        }
-
-        var addModifier = function(val, modifier){
-            if (!modifier || modifier.indexOf(placeHolder) < 0) {
-                return val;
-            } else {
-                return modifier.replace(placeHolder, val);
-            }
-        };
-
-        function gridItemHasConfig(styles, config) {
-
-            if(_.isEmpty(styles) && _.isEmpty(config)) {
-                return false;
-            } else {
-                return true;
-            }
-
-        }
-
-        // *********************************************
-        // Area management functions
-        // *********************************************
-
-        $scope.clickCell = function(index, cells, row) {
-            cells[index].active = true;
-            row.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideCell = function(index, cells, row) {
-            cells[index].active = false;
-            row.hasActiveChild = hasActiveChild(row, cells);
-        };
-
-        $scope.cellPreview = function (cell) {
-            if (cell && cell.$allowedEditors) {
-                var editor = cell.$allowedEditors[0];
-                return editor.icon;
-            } else {
-                return "icon-layout";
-            }
-        };
-
-
-        // *********************************************
-        // Control management functions
-        // *********************************************
-        $scope.clickControl = function (index, controls, cell) {
-            controls[index].active = true;
-            cell.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideControl = function (index, controls, cell) {
-            controls[index].active = false;
-            cell.hasActiveChild = hasActiveChild(cell, controls);
-        };
-
-        function hasActiveChild(item, children) {
-
-            var activeChild = false;
-
-            for(var i = 0; children.length > i; i++) {
-                var child = children[i];
-
-                if(child.active) {
-                    activeChild = true;
-                }
-            }
-
-            if(activeChild) {
-                return true;
-            }
-
-        }
-
-
-        var guid = (function () {
-            function s4() {
-                return Math.floor((1 + Math.random()) * 0x10000)
-                           .toString(16)
-                           .substring(1);
-            }
-            return function () {
-                return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-                       s4() + "-" + s4() + s4() + s4();
-            };
-        })();
-
-        $scope.setUniqueId = function (cell, index) {
-            return guid();
-        };
-
-        $scope.addControl = function (editor, cell, index, initialize) {
-
-            initialize = (initialize !== false);
-
-            var newControl = {
-                value: null,
-                editor: editor,
-                $initializing: initialize
-            };
-
-            if (index === undefined) {
-                index = cell.controls.length;
-            }
-
-            newControl.active = true;
-
-            //populate control
-            $scope.initControl(newControl, index + 1);
-
-            cell.controls.push(newControl);
-
-            eventsService.emit("grid.itemAdded", { scope: $scope, element: $element, cell: cell, item: newControl });
-
-        };
-
-        $scope.addTinyMce = function (cell) {
-            var rte = $scope.getEditor("rte");
-            $scope.addControl(rte, cell);
-        };
-
-        $scope.getEditor = function (alias) {
-            return _.find($scope.availableEditors, function (editor) { return editor.alias === alias; });
-        };
-
-        $scope.removeControl = function (cell, $index) {
-            $scope.currentControl = null;
-            cell.controls.splice($index, 1);
-        };
-
-        $scope.percentage = function (spans) {
-            return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
-        };
-
-
-        $scope.clearPrompt = function (scopedObject, e) {
-            scopedObject.deletePrompt = false;
-            e.preventDefault();
-            e.stopPropagation();
-        };
-
-        $scope.togglePrompt = function (scopedObject) {
-            scopedObject.deletePrompt = !scopedObject.deletePrompt;
-        };
-
-        $scope.hidePrompt = function (scopedObject) {
-            scopedObject.deletePrompt = false;
-        };
-
-        $scope.toggleAddRow = function() {
-          $scope.showRowConfigurations = !$scope.showRowConfigurations;
-        };
-
-
-        // *********************************************
-        // Initialization
-        // these methods are called from ng-init on the template
-        // so we can controll their first load data
-        //
-        // intialization sets non-saved data like percentage sizing, allowed editors and
-        // other data that should all be pre-fixed with $ to strip it out on save
-        // *********************************************
-
-        // *********************************************
-        // Init template + sections
-        // *********************************************
-        $scope.initContent = function () {
-            var clear = true;
-            
-            //settings indicator shortcut
-            if (($scope.model.config.items.config && $scope.model.config.items.config.length > 0) || ($scope.model.config.items.styles && $scope.model.config.items.styles.length > 0)) {
-                $scope.hasSettings = true;
-            }
-
-            //ensure the grid has a column value set,
-            //if nothing is found, set it to 12
-            if (!$scope.model.config.items.columns){
-                $scope.model.config.items.columns = 12;
-            } else if (angular.isString($scope.model.config.items.columns)) {
-                $scope.model.config.items.columns = parseInt($scope.model.config.items.columns);
-            }
-
-            if ($scope.model.value && $scope.model.value.sections && $scope.model.value.sections.length > 0 && $scope.model.value.sections[0].rows && $scope.model.value.sections[0].rows.length > 0) {
-
-                if ($scope.model.value.name && angular.isArray($scope.model.config.items.templates)) {
-
-                    //This will occur if it is an existing value, in which case
-                    // we need to determine which layout was applied by looking up
-                    // the name
-                    // TODO: We need to change this to an immutable ID!!
-
-                    var found = _.find($scope.model.config.items.templates, function (t) {
-                        return t.name === $scope.model.value.name;
-                    });
-
-                    if (found && angular.isArray(found.sections) && found.sections.length === $scope.model.value.sections.length) {
-
-                        //Cool, we've found the template associated with our current value with matching sections counts, now we need to
-                        // merge this template data on to our current value (as if it was new) so that we can preserve what is and isn't
-                        // allowed for this template based on the current config.
-
-                        _.each(found.sections, function (templateSection, index) {
-                            angular.extend($scope.model.value.sections[index], angular.copy(templateSection));
-                        });
-
-                    }
-                }
-
-                _.forEach($scope.model.value.sections, function (section, index) {
-
-                    if (section.grid > 0) {
-                        $scope.initSection(section);
-
-                        //we do this to ensure that the grid can be reset by deleting the last row
-                        if (section.rows.length > 0) {
-                            clear = false;
-                        }
-                    } else {
-                        $scope.model.value.sections.splice(index, 1);
-                    }
-                });
-            } else if ($scope.model.config.items.templates && $scope.model.config.items.templates.length === 1) {
-                $scope.addTemplate($scope.model.config.items.templates[0]);
-                clear = false;
-            }
-
-            if (clear) {
-                $scope.model.value = undefined;
-            }
-        };
-
-        $scope.initSection = function (section) {
-            section.$percentage = $scope.percentage(section.grid);
-
-            section.$allowedLayouts = getAllowedLayouts(section);
-
-            if (!section.rows || section.rows.length === 0) {
-                section.rows = [];
-                if(section.$allowedLayouts.length === 1){
-                    $scope.addRow(section, section.$allowedLayouts[0], true);
-                }
-            } else {
-                _.forEach(section.rows, function (row, index) {
-                    if (!row.$initialized) {
-                        var initd = $scope.initRow(row);
-
-                        //if init fails, remove
-                        if (!initd) {
-                            section.rows.splice(index, 1);
-                        } else {
-                            section.rows[index] = initd;
-                        }
-                    }
-                });
-
-                // if there is more than one row added - hide row add tools
-                $scope.showRowConfigurations = false;
-            }
-        };
-
-
-        // *********************************************
-        // Init layout / row
-        // *********************************************
-        $scope.initRow = function (row) {
-            
-            //merge the layout data with the original config data
-            //if there are no config info on this, splice it out
-            var original = _.find($scope.model.config.items.layouts, function (o) { return o.name === row.name; });
-
-            if (!original) {
-                return null;
-            } else {
-                //make a copy to not touch the original config
-                original = angular.copy(original);
-                original.styles = row.styles;
-                original.config = row.config;
-                original.hasConfig = gridItemHasConfig(row.styles, row.config);
-
-
-                //sync area configuration
-                _.each(original.areas, function (area, areaIndex) {
-
-
-                    if (area.grid > 0) {
-                        var currentArea = row.areas[areaIndex];
-
-                        if (currentArea) {
-                            area.config = currentArea.config;
-                            area.styles = currentArea.styles;
-                            area.hasConfig = gridItemHasConfig(currentArea.styles, currentArea.config);
-                        }
-
-                        //set editor permissions
-                        if (!area.allowed || area.allowAll === true) {
-                            area.$allowedEditors = $scope.availableEditors;
-                            area.$allowsRTE = true;
-                        } else {
-                            area.$allowedEditors = _.filter($scope.availableEditors, function (editor) {
-                                return _.indexOf(area.allowed, editor.alias) >= 0;
-                            });
-
-                            if (_.indexOf(area.allowed, "rte") >= 0) {
-                                area.$allowsRTE = true;
-                            }
-                        }
-
-                        //copy over existing controls into the new areas
-                        if (row.areas.length > areaIndex && row.areas[areaIndex].controls) {
-                            area.controls = currentArea.controls;
-
-                            _.forEach(area.controls, function (control, controlIndex) {
-                                $scope.initControl(control, controlIndex);
-                            });
-
-                        } else {
-                            //if empty
-                            area.controls = [];
-
-                            //if only one allowed editor
-                            if(area.$allowedEditors.length === 1){
-                                $scope.addControl(area.$allowedEditors[0], area, 0, false);
-                            }
-                        }
-
-                        //set width
-                        area.$percentage = $scope.percentage(area.grid);
-                        area.$uniqueId = $scope.setUniqueId();
-
-                    } else {
-                        original.areas.splice(areaIndex, 1);
-                    }
-                });
-
-                //replace the old row
-                original.$initialized = true;
-
-                //set a disposable unique ID
-                original.$uniqueId = $scope.setUniqueId();
-
-                //set a no disposable unique ID (util for row styling)
-                original.id = !row.id ? $scope.setUniqueId() : row.id;
-
-                return original;
-            }
-
-        };
-
-
-        // *********************************************
-        // Init control
-        // *********************************************
-
-        $scope.initControl = function (control, index) {
-            control.$index = index;
-            control.$uniqueId = $scope.setUniqueId();
-
-            //error handling in case of missing editor..
-            //should only happen if stripped earlier
-            if (!control.editor) {
-                control.$editorPath = "views/propertyeditors/grid/editors/error.html";
-            }
-
-            if (!control.$editorPath) {
-                var editorConfig = $scope.getEditor(control.editor.alias);
-
-                if (editorConfig) {
-                    control.editor = editorConfig;
-
-                    //if its an absolute path
-                    if (control.editor.view.startsWith("/") || control.editor.view.startsWith("~/")) {
-                        control.$editorPath = umbRequestHelper.convertVirtualToAbsolutePath(control.editor.view);
+                        cancelMove = true;
                     }
                     else {
-                        //use convention
-                        control.$editorPath = "views/propertyeditors/grid/editors/" + control.editor.view + ".html";
+                        if (event.target.getScope_HackForSortable().area.controls.length == 0) {
+
+                            $scope.$apply(function () {
+                                event.target.getScope_HackForSortable().area.dropOnEmpty = true;
+                            });
+                            ui.placeholder.hide();
+                        } else {
+                            ui.placeholder.show();
+                        }
+                        cancelMove = false;
+                    }
+                },
+
+                out: function (event, ui) {
+                    $scope.$apply(function () {
+                        var dropArea = event.target.getScope_HackForSortable().area;
+                        dropArea.dropNotAllowed = false;
+                        dropArea.dropOnEmpty = false;
+                    });
+                },
+
+                update: function (event, ui) {
+                    /* add all RTEs which are affected by the dragging */
+                    if (!ui.sender) {
+                        if (cancelMove) {
+                            ui.item.sortable.cancel();
+                        }
+                        ui.item.parents(".umb-cell-content").find(".umb-rte").each(function (key, value) {
+                            var v1 = value.id;
+
+                            if ($.inArray(v1, notIncludedRte) < 0) {
+                                notIncludedRte.splice(0, 0, v1);
+                            }
+                        });
+                    }
+                    else {
+                        $(event.target).find(".umb-rte").each(function () {
+                            if ($.inArray($(this).attr("id"), notIncludedRte) < 0) {
+                                notIncludedRte.splice(0, 0, $(this).attr("id"));
+                            }
+                        });
+                    }
+                    currentForm.$setDirty();
+                },
+
+                start: function (event, ui) {
+                    //Get the starting area for reference
+                    var area = event.target.getScope_HackForSortable().area;
+                    startingArea = area;
+
+                    // fade out control when sorting
+                    ui.item[0].style.display = "block";
+                    ui.item[0].style.opacity = "0.5";
+
+                    // reset dragged RTE settings in case a RTE isn't dragged
+                    draggedRteSettings = undefined;
+                    ui.item[0].style.display = "block";
+                    ui.item.find(".umb-rte").each(function (key, value) {
+                        notIncludedRte = [];
+                        var rteId = value.id;
+
+                        var editors = _.findWhere(tinyMCE.editors, { id: rteId });
+
+                        // save the dragged RTE settings
+                        if (editors) {
+                            draggedRteSettings = editors.settings;
+
+                            // remove the dragged RTE
+                            tinyMCE.execCommand("mceRemoveEditor", false, rteId);
+
+                        }
+
+                    });
+                },
+
+                stop: function (event, ui) {
+                    // Fade in control when sorting stops
+                    ui.item[0].style.opacity = "1";
+
+                    ui.item.offsetParent().find(".umb-rte").each(function (key, value) {
+                        var rteId = value.id;
+                        if ($.inArray(rteId, notIncludedRte) < 0) {
+                            // add all dragged's neighbouring RTEs in the new cell
+                            notIncludedRte.splice(0, 0, rteId);
+                        }
+                    });
+
+                        // reconstruct the dragged RTE (could be undefined when dragging something else than RTE)
+                        if (draggedRteSettings !== undefined) {
+                            tinyMCE.init(draggedRteSettings);
+                        }
+
+                        _.forEach(notIncludedRte, function (id) {
+                            // reset all the other RTEs
+                            if (draggedRteSettings === undefined || id !== draggedRteSettings.id) {
+                                var rteSettings = _.findWhere(tinyMCE.editors, { id: id }).settings;
+                                tinyMCE.execCommand("mceRemoveEditor", false, id);
+                                tinyMCE.init(rteSettings);
+                            }
+                        });
+
+                    $scope.$apply(function () {
+
+                        var cell = event.target.getScope_HackForSortable().area;
+                        cell.hasActiveChild = hasActiveChild(cell, cell.controls);
+                        cell.active = false;
+                    });
+                }
+
+            };
+
+            $scope.toggleSortMode = function () {
+                $scope.sortMode = !$scope.sortMode;
+                if ($scope.sortMode) {
+                    $scope.reorderKey = "general_reorderDone";
+                } else {
+                    $scope.reorderKey = "general_reorder";
+                }
+            };
+
+            $scope.showReorderButton = function () {
+                if ($scope.model.value && $scope.model.value.sections) {
+                    for (var i = 0; $scope.model.value.sections.length > i; i++) {
+                        var section = $scope.model.value.sections[i];
+                        if (section.rows && section.rows.length > 0) {
+                            return true;
+                        }
                     }
                 }
+            };
+
+            // *********************************************
+            // Add items overlay menu
+            // *********************************************
+            $scope.openEditorOverlay = function (event, area, index, key) {
+                var title = "";
+                localizationService.localize("grid_insertControl").then(function (value) {
+                    title = value;
+                    $scope.editorOverlay = {
+                        view: "itempicker",
+                        filter: area.$allowedEditors.length > 15,
+                        title: title,
+                        availableItems: area.$allowedEditors,
+                        event: event,
+                        show: true,
+                        submit: function (model) {
+                            if (model.selectedItem) {
+                                $scope.addControl(model.selectedItem, area, index);
+                                $scope.editorOverlay.show = false;
+                                $scope.editorOverlay = null;
+                            }
+                        }
+                    };
+                });
+            };
+
+            // *********************************************
+            // Template management functions
+            // *********************************************
+
+            $scope.addTemplate = function (template) {
+                $scope.model.value = angular.copy(template);
+
+                //default row data
+                _.forEach($scope.model.value.sections, function (section) {
+                    $scope.initSection(section);
+                });
+            };
+
+
+            // *********************************************
+            // Row management function
+            // *********************************************
+
+            $scope.clickRow = function (index, rows) {
+                rows[index].active = true;
+            };
+
+            $scope.clickOutsideRow = function (index, rows) {
+                rows[index].active = false;
+            };
+
+            function getAllowedLayouts(section) {
+
+                var layouts = $scope.model.config.items.layouts;
+
+                //This will occur if it is a new section which has been
+                // created from a 'template'
+                if (section.allowed && section.allowed.length > 0) {
+                    return _.filter(layouts, function (layout) {
+                        return _.indexOf(section.allowed, layout.name) >= 0;
+                    });
+                }
                 else {
-                    control.$editorPath = "views/propertyeditors/grid/editors/error.html";
+
+
+                    return layouts;
                 }
             }
 
+            $scope.addRow = function (section, layout, isInit) {
 
-        };
+                //copy the selected layout into the rows collection
+                var row = angular.copy(layout);
+
+                // Init row value
+                row = $scope.initRow(row);
+
+                // Push the new row
+                if (row) {
+                    section.rows.push(row);
+                }
+                if (!isInit) {
+                    currentForm.$setDirty();
+                }
+
+                $scope.showRowConfigurations = false;
+
+                eventsService.emit("grid.rowAdded", { scope: $scope, element: $element, row: row });
+
+            };
+
+            $scope.removeRow = function (section, $index) {
+                if (section.rows.length > 0) {
+                    section.rows.splice($index, 1);
+                    $scope.currentRow = null;
+                    $scope.openRTEToolbarId = null;
+                    currentForm.$setDirty();
+                }
+
+                if (section.rows.length === 0) {
+                    $scope.showRowConfigurations = true;
+                }
+            };
+
+            var shouldApply = function (item, itemType, gridItem) {
+                if (item.applyTo === undefined || item.applyTo === null || item.applyTo === "") {
+                    return true;
+                }
+
+                if (typeof (item.applyTo) === "string") {
+                    return item.applyTo === itemType;
+                }
+
+                if (itemType === "row") {
+                    if (item.applyTo.row === undefined) {
+                        return false;
+                    }
+                    if (item.applyTo.row === null || item.applyTo.row === "") {
+                        return true;
+                    }
+                    var rows = item.applyTo.row.split(',');
+                    return _.indexOf(rows, gridItem.name) !== -1;
+                } else if (itemType === "cell") {
+                    if (item.applyTo.cell === undefined) {
+                        return false;
+                    }
+                    if (item.applyTo.cell === null || item.applyTo.cell === "") {
+                        return true;
+                    }
+                    var cells = item.applyTo.cell.split(',');
+                    var cellSize = gridItem.grid.toString();
+                    return _.indexOf(cells, cellSize) !== -1;
+                }
+            }
+
+            $scope.editGridItemSettings = function (gridItem, itemType) {
+
+                placeHolder = "{0}";
+
+                var styles, config;
+                if (itemType === 'control') {
+                    styles = null;
+                    config = angular.copy(gridItem.editor.config.settings);
+                } else {
+                    styles = _.filter(angular.copy($scope.model.config.items.styles), function (item) { return shouldApply(item, itemType, gridItem); });
+                    config = _.filter(angular.copy($scope.model.config.items.config), function (item) { return shouldApply(item, itemType, gridItem); });
+                }
+
+                if (angular.isObject(gridItem.config)) {
+                    _.each(config, function (cfg) {
+                        var val = gridItem.config[cfg.key];
+                        if (val) {
+                            cfg.value = stripModifier(val, cfg.modifier);
+                        }
+                    });
+                }
+
+                if (angular.isObject(gridItem.styles)) {
+                    _.each(styles, function (style) {
+                        var val = gridItem.styles[style.key];
+                        if (val) {
+                            style.value = stripModifier(val, style.modifier);
+                        }
+                    });
+                }
+
+                $scope.gridItemSettingsDialog = {};
+                $scope.gridItemSettingsDialog.view = "views/propertyeditors/grid/dialogs/config.html";
+                $scope.gridItemSettingsDialog.title = "Settings";
+                $scope.gridItemSettingsDialog.styles = styles;
+                $scope.gridItemSettingsDialog.config = config;
+
+                $scope.gridItemSettingsDialog.show = true;
+
+                $scope.gridItemSettingsDialog.submit = function (model) {
+
+                    var styleObject = {};
+                    var configObject = {};
+
+                    _.each(model.styles, function (style) {
+                        if (style.value) {
+                            styleObject[style.key] = addModifier(style.value, style.modifier);
+                        }
+                    });
+                    _.each(model.config, function (cfg) {
+                        if (cfg.value) {
+                            configObject[cfg.key] = addModifier(cfg.value, cfg.modifier);
+                        }
+                    });
+
+                    gridItem.styles = styleObject;
+                    gridItem.config = configObject;
+                    gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
+
+                    currentForm.$setDirty();
+
+                    $scope.gridItemSettingsDialog.show = false;
+                    $scope.gridItemSettingsDialog = null;
+                };
+
+                $scope.gridItemSettingsDialog.close = function (oldModel) {
+                    $scope.gridItemSettingsDialog.show = false;
+                    $scope.gridItemSettingsDialog = null;
+                };
+
+            };
+
+            function stripModifier(val, modifier) {
+                if (!val || !modifier || modifier.indexOf(placeHolder) < 0) {
+                    return val;
+                } else {
+                    var paddArray = modifier.split(placeHolder);
+                    if (paddArray.length == 1) {
+                        if (modifier.indexOf(placeHolder) === 0) {
+                            return val.slice(0, -paddArray[0].length);
+                        } else {
+                            return val.slice(paddArray[0].length, 0);
+                        }
+                    } else {
+                        if (paddArray[1].length === 0) {
+                            return val.slice(paddArray[0].length);
+                        }
+                        return val.slice(paddArray[0].length, -paddArray[1].length);
+                    }
+                }
+            }
+
+            var addModifier = function (val, modifier) {
+                if (!modifier || modifier.indexOf(placeHolder) < 0) {
+                    return val;
+                } else {
+                    return modifier.replace(placeHolder, val);
+                }
+            };
+
+            function gridItemHasConfig(styles, config) {
+
+                if (_.isEmpty(styles) && _.isEmpty(config)) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
+
+            // *********************************************
+            // Area management functions
+            // *********************************************
+
+            $scope.clickCell = function (index, cells, row) {
+                cells[index].active = true;
+                row.hasActiveChild = true;
+            };
+
+            $scope.clickOutsideCell = function (index, cells, row) {
+                cells[index].active = false;
+                row.hasActiveChild = hasActiveChild(row, cells);
+            };
+
+            $scope.cellPreview = function (cell) {
+                if (cell && cell.$allowedEditors) {
+                    var editor = cell.$allowedEditors[0];
+                    return editor.icon;
+                } else {
+                    return "icon-layout";
+                }
+            };
 
 
-        gridService.getGridEditors().then(function (response) {
-            $scope.availableEditors = response.data;
+            // *********************************************
+            // Control management functions
+            // *********************************************
+            $scope.clickControl = function (index, controls, cell) {
+                controls[index].active = true;
+                cell.hasActiveChild = true;
+            };
 
-            //Localize the grid editor names
-            angular.forEach($scope.availableEditors, function (value, key) {
-                //If no translation is provided, keep using the editor name from the manifest
-                if (localizationService.dictionary.hasOwnProperty("grid_" + value.alias)) {
-                    localizationService.localize("grid_" + value.alias).then(function(v){
-                        value.name = v;
+            $scope.clickOutsideControl = function (index, controls, cell) {
+                controls[index].active = false;
+                cell.hasActiveChild = hasActiveChild(cell, controls);
+            };
+
+            function hasActiveChild(item, children) {
+
+                var activeChild = false;
+
+                for (var i = 0; children.length > i; i++) {
+                    var child = children[i];
+
+                    if (child.active) {
+                        activeChild = true;
+                    }
+                }
+
+                if (activeChild) {
+                    return true;
+                }
+
+            }
+
+
+            var guid = (function () {
+                function s4() {
+                    return Math.floor((1 + Math.random()) * 0x10000)
+                        .toString(16)
+                        .substring(1);
+                }
+                return function () {
+                    return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
+                        s4() + "-" + s4() + s4() + s4();
+                };
+            })();
+
+            $scope.setUniqueId = function (cell, index) {
+                return guid();
+            };
+
+            $scope.addControl = function (editor, cell, index, initialize) {
+
+                initialize = (initialize !== false);
+
+                var newControl = {
+                    value: null,
+                    editor: editor,
+                    $initializing: initialize
+                };
+
+                if (index === undefined) {
+                    index = cell.controls.length;
+                }
+
+                newControl.active = true;
+
+                //populate control
+                $scope.initControl(newControl, index + 1);
+
+                cell.controls.push(newControl);
+
+                eventsService.emit("grid.itemAdded", { scope: $scope, element: $element, cell: cell, item: newControl });
+
+            };
+
+            $scope.addTinyMce = function (cell) {
+                var rte = $scope.getEditor("rte");
+                $scope.addControl(rte, cell);
+            };
+
+            $scope.getEditor = function (alias) {
+                return _.find($scope.availableEditors, function (editor) { return editor.alias === alias; });
+            };
+
+            $scope.removeControl = function (cell, $index) {
+                $scope.currentControl = null;
+                cell.controls.splice($index, 1);
+            };
+
+            $scope.percentage = function (spans) {
+                return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
+            };
+
+
+            $scope.clearPrompt = function (scopedObject, e) {
+                scopedObject.deletePrompt = false;
+                e.preventDefault();
+                e.stopPropagation();
+            };
+
+            $scope.togglePrompt = function (scopedObject) {
+                scopedObject.deletePrompt = !scopedObject.deletePrompt;
+            };
+
+            $scope.hidePrompt = function (scopedObject) {
+                scopedObject.deletePrompt = false;
+            };
+
+            $scope.toggleAddRow = function () {
+                $scope.showRowConfigurations = !$scope.showRowConfigurations;
+            };
+
+
+            // *********************************************
+            // Initialization
+            // these methods are called from ng-init on the template
+            // so we can controll their first load data
+            //
+            // intialization sets non-saved data like percentage sizing, allowed editors and
+            // other data that should all be pre-fixed with $ to strip it out on save
+            // *********************************************
+
+            // *********************************************
+            // Init template + sections
+            // *********************************************
+            $scope.initContent = function () {
+                var clear = true;
+
+                //settings indicator shortcut
+                if (($scope.model.config.items.config && $scope.model.config.items.config.length > 0) || ($scope.model.config.items.styles && $scope.model.config.items.styles.length > 0)) {
+                    $scope.hasSettings = true;
+                }
+
+                //ensure the grid has a column value set,
+                //if nothing is found, set it to 12
+                if (!$scope.model.config.items.columns) {
+                    $scope.model.config.items.columns = 12;
+                } else if (angular.isString($scope.model.config.items.columns)) {
+                    $scope.model.config.items.columns = parseInt($scope.model.config.items.columns);
+                }
+
+                if ($scope.model.value && $scope.model.value.sections && $scope.model.value.sections.length > 0 && $scope.model.value.sections[0].rows && $scope.model.value.sections[0].rows.length > 0) {
+
+                    if ($scope.model.value.name && angular.isArray($scope.model.config.items.templates)) {
+
+                        //This will occur if it is an existing value, in which case
+                        // we need to determine which layout was applied by looking up
+                        // the name
+                        // TODO: We need to change this to an immutable ID!!
+
+                        var found = _.find($scope.model.config.items.templates, function (t) {
+                            return t.name === $scope.model.value.name;
+                        });
+
+                        if (found && angular.isArray(found.sections) && found.sections.length === $scope.model.value.sections.length) {
+
+                            //Cool, we've found the template associated with our current value with matching sections counts, now we need to
+                            // merge this template data on to our current value (as if it was new) so that we can preserve what is and isn't
+                            // allowed for this template based on the current config.
+
+                            _.each(found.sections, function (templateSection, index) {
+                                angular.extend($scope.model.value.sections[index], angular.copy(templateSection));
+                            });
+
+                        }
+                    }
+
+                    _.forEach($scope.model.value.sections, function (section, index) {
+
+                        if (section.grid > 0) {
+                            $scope.initSection(section);
+
+                            //we do this to ensure that the grid can be reset by deleting the last row
+                            if (section.rows.length > 0) {
+                                clear = false;
+                            }
+                        } else {
+                            $scope.model.value.sections.splice(index, 1);
+                        }
+                    });
+                } else if ($scope.model.config.items.templates && $scope.model.config.items.templates.length === 1) {
+                    $scope.addTemplate($scope.model.config.items.templates[0]);
+                    clear = false;
+                }
+
+                if (clear) {
+                    $scope.model.value = undefined;
+                }
+            };
+
+            $scope.initSection = function (section) {
+                section.$percentage = $scope.percentage(section.grid);
+
+                section.$allowedLayouts = getAllowedLayouts(section);
+
+                if (!section.rows || section.rows.length === 0) {
+                    section.rows = [];
+                    if (section.$allowedLayouts.length === 1) {
+                        $scope.addRow(section, section.$allowedLayouts[0], true);
+                    }
+                } else {
+                    _.forEach(section.rows, function (row, index) {
+                        if (!row.$initialized) {
+                            var initd = $scope.initRow(row);
+
+                            //if init fails, remove
+                            if (!initd) {
+                                section.rows.splice(index, 1);
+                            } else {
+                                section.rows[index] = initd;
+                            }
+                        }
+                    });
+
+                    // if there is more than one row added - hide row add tools
+                    $scope.showRowConfigurations = false;
+                }
+            };
+
+
+            // *********************************************
+            // Init layout / row
+            // *********************************************
+            $scope.initRow = function (row) {
+
+                //merge the layout data with the original config data
+                //if there are no config info on this, splice it out
+                var original = _.find($scope.model.config.items.layouts, function (o) { return o.name === row.name; });
+
+                if (!original) {
+                    return null;
+                } else {
+                    //make a copy to not touch the original config
+                    original = angular.copy(original);
+                    original.styles = row.styles;
+                    original.config = row.config;
+                    original.hasConfig = gridItemHasConfig(row.styles, row.config);
+
+
+                    //sync area configuration
+                    _.each(original.areas, function (area, areaIndex) {
+
+
+                        if (area.grid > 0) {
+                            var currentArea = row.areas[areaIndex];
+
+                            if (currentArea) {
+                                area.config = currentArea.config;
+                                area.styles = currentArea.styles;
+                                area.hasConfig = gridItemHasConfig(currentArea.styles, currentArea.config);
+                            }
+
+                            //set editor permissions
+                            if (!area.allowed || area.allowAll === true) {
+                                area.$allowedEditors = $scope.availableEditors;
+                                area.$allowsRTE = true;
+                            } else {
+                                area.$allowedEditors = _.filter($scope.availableEditors, function (editor) {
+                                    return _.indexOf(area.allowed, editor.alias) >= 0;
+                                });
+
+                                if (_.indexOf(area.allowed, "rte") >= 0) {
+                                    area.$allowsRTE = true;
+                                }
+                            }
+
+                            //copy over existing controls into the new areas
+                            if (row.areas.length > areaIndex && row.areas[areaIndex].controls) {
+                                area.controls = currentArea.controls;
+
+                                _.forEach(area.controls, function (control, controlIndex) {
+                                    $scope.initControl(control, controlIndex);
+                                });
+
+                            } else {
+                                //if empty
+                                area.controls = [];
+
+                                //if only one allowed editor
+                                if (area.$allowedEditors.length === 1) {
+                                    $scope.addControl(area.$allowedEditors[0], area, 0, false);
+                                }
+                            }
+
+                            //set width
+                            area.$percentage = $scope.percentage(area.grid);
+                            area.$uniqueId = $scope.setUniqueId();
+
+                        } else {
+                            original.areas.splice(areaIndex, 1);
+                        }
+                    });
+
+                    //replace the old row
+                    original.$initialized = true;
+
+                    //set a disposable unique ID
+                    original.$uniqueId = $scope.setUniqueId();
+
+                    //set a no disposable unique ID (util for row styling)
+                    original.id = !row.id ? $scope.setUniqueId() : row.id;
+
+                    return original;
+                }
+
+            };
+
+
+            // *********************************************
+            // Init control
+            // *********************************************
+
+            $scope.initControl = function (control, index) {
+                control.$index = index;
+                control.$uniqueId = $scope.setUniqueId();
+
+                //error handling in case of missing editor..
+                //should only happen if stripped earlier
+                if (!control.editor) {
+                    control.$editorPath = "views/propertyeditors/grid/editors/error.html";
+                }
+
+                if (!control.$editorPath) {
+                    var editorConfig = $scope.getEditor(control.editor.alias);
+
+                    if (editorConfig) {
+                        control.editor = editorConfig;
+
+                        //if its an absolute path
+                        if (control.editor.view.startsWith("/") || control.editor.view.startsWith("~/")) {
+                            control.$editorPath = umbRequestHelper.convertVirtualToAbsolutePath(control.editor.view);
+                        }
+                        else {
+                            //use convention
+                            control.$editorPath = "views/propertyeditors/grid/editors/" + control.editor.view + ".html";
+                        }
+                    }
+                    else {
+                        control.$editorPath = "views/propertyeditors/grid/editors/error.html";
+                    }
+                }
+
+
+            };
+
+
+            gridService.getGridEditors().then(function (response) {
+                $scope.availableEditors = response.data;
+
+                //Localize the grid editor names
+                angular.forEach($scope.availableEditors, function (value, key) {
+                    //If no translation is provided, keep using the editor name from the manifest
+                    if (localizationService.dictionary.hasOwnProperty("grid_" + value.alias)) {
+                        localizationService.localize("grid_" + value.alias).then(function (v) {
+                            value.name = v;
+                        });
+                    }
+                });
+
+                $scope.contentReady = true;
+
+                // *********************************************
+                // Init grid
+                // *********************************************
+
+                eventsService.emit("grid.initializing", { scope: $scope, element: $element });
+
+                $scope.initContent();
+
+                eventsService.emit("grid.initialized", { scope: $scope, element: $element });
+
+            });
+
+            //Clean the grid value before submitting to the server, we don't need
+            // all of that grid configuration in the value to be stored!! All of that
+            // needs to be merged in at runtime to ensure that the real config values are used
+            // if they are ever updated.
+
+            var unsubscribe = $scope.$on("formSubmitting", function (e, args) {
+
+                if (args.action === "save" && $scope.model.value && $scope.model.value.sections) {
+                    _.each($scope.model.value.sections, function (section) {
+                        if (section.rows) {
+                            _.each(section.rows, function (row) {
+                                if (row.areas) {
+                                    _.each(row.areas, function (area) {
+
+                                        //Remove the 'editors' - these are the allowed editors, these will
+                                        // be injected at runtime to this editor, it should not be persisted
+
+                                        if (area.editors) {
+                                            delete area.editors;
+                                        }
+
+                                        if (area.controls) {
+                                            _.each(area.controls, function (control) {
+                                                if (control.editor) {
+                                                    //replace
+                                                    var alias = control.editor.alias;
+                                                    control.editor = {
+                                                        alias: alias
+                                                    };
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            });
+                        }
                     });
                 }
             });
 
-            $scope.contentReady = true;
-
-            // *********************************************
-            // Init grid
-            // *********************************************
-
-            eventsService.emit("grid.initializing", { scope: $scope, element: $element });
-
-            $scope.initContent();
-
-            eventsService.emit("grid.initialized", { scope: $scope, element: $element });
+            //when the scope is destroyed we need to unsubscribe
+            $scope.$on("$destroy", function () {
+                unsubscribe();
+            });
 
         });
-
-        //Clean the grid value before submitting to the server, we don't need
-        // all of that grid configuration in the value to be stored!! All of that
-        // needs to be merged in at runtime to ensure that the real config values are used
-        // if they are ever updated.
-
-        var unsubscribe = $scope.$on("formSubmitting", function (e, args) {
-            
-            if (args.action === "save" && $scope.model.value && $scope.model.value.sections) {
-                _.each($scope.model.value.sections, function(section) {
-                    if (section.rows) {
-                        _.each(section.rows, function (row) {
-                            if (row.areas) {
-                                _.each(row.areas, function (area) {
-
-                                    //Remove the 'editors' - these are the allowed editors, these will
-                                    // be injected at runtime to this editor, it should not be persisted
-
-                                    if (area.editors) {
-                                        delete area.editors;
-                                    }
-
-                                    if (area.controls) {
-                                        _.each(area.controls, function (control) {
-                                            if (control.editor) {
-                                                //replace
-                                                var alias = control.editor.alias;
-                                                control.editor = {
-                                                    alias: alias
-                                                };
-                                            }
-                                        });
-                                    }
-                                });
-                            }
-                        });
-                    }
-                });
-            }
-        });
-
-        //when the scope is destroyed we need to unsubscribe
-        $scope.$on("$destroy", function () {
-            unsubscribe();
-        });
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index f0171e2d00..068a60462c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
 
-    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white; border-color: white;">
+    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white;">
 
         <umb-editor-sub-header-content-right>
             <umb-button
@@ -187,10 +187,10 @@
 
                                                               <div class="umb-control-inner" ng-hide="sortMode">
 
-                                                                   <div class="umb-control-bar umb-control-handle">
+                                                                  <div class="umb-control-bar umb-control-handle">
 
                                                                       <div class="umb-control-title" ng-if="control.active">
-                                                                         {{control.editor.name}}
+                                                                          {{control.editor.name}}
                                                                       </div>
 
                                                                       <div class="umb-tools" ng-if="control.active">
@@ -199,25 +199,24 @@
                                                                               <i class="umb-control-tool-icon icon-settings" ng-click="editGridItemSettings(control, 'control')"></i>
                                                                           </div>
 
-                                                                        <div class="umb-control-tool">
-                                                                            <i class="umb-control-tool-icon icon-trash"  ng-click="togglePrompt(control)"></i>
-                                                                            <umb-confirm-action
-                                                                                ng-if="control.deletePrompt"
-                                                                                direction="left"
-                                                                                on-confirm="removeControl(area, $index)"
-                                                                                on-cancel="hidePrompt(control)">
-                                                                            </umb-confirm-action>
-                                                                        </div>
+                                                                          <div class="umb-control-tool">
+                                                                              <i class="umb-control-tool-icon icon-trash" ng-click="togglePrompt(control)"></i>
+                                                                              <umb-confirm-action ng-if="control.deletePrompt"
+                                                                                                  direction="left"
+                                                                                                  on-confirm="removeControl(area, $index)"
+                                                                                                  on-cancel="hidePrompt(control)">
+                                                                              </umb-confirm-action>
+                                                                          </div>
 
                                                                       </div>
 
-                                                                   </div>
+                                                                  </div>
 
-                                                                 <!-- Redering the editor for specific control -->
-                                                                 <div ng-if="control && control.$editorPath"
+                                                                  <!-- Redering the editor for specific control -->
+                                                                  <div ng-if="control && control.$editorPath"
                                                                        ng-include="control.$editorPath"
                                                                        class="umb-cell-{{control.editor.view}}">
-                                                                 </div>
+                                                                  </div>
 
                                                               </div>
                                                           </div>

From e6720a175cbf9b45a09b4b059ae9a15fed1bb0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 11:36:50 +0100
Subject: [PATCH 089/130] changed notification auto remove time to 10 seconds

---
 .../common/services/notifications.service.js  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
index 2575b05bb6..c123ac6cea 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
@@ -85,17 +85,17 @@ angular.module('umbraco.services')
 				nArray.push(item);
 
 				if(!item.sticky) {
-					$timeout(function() {
-						var found = _.find(nArray, function(i) {
-						return i.id === item.id;
-					});
-
-					if (found) {
-						var index = nArray.indexOf(found);
-						nArray.splice(index, 1);
-					}
-
-					}, 7000);
+					$timeout(
+                        function() {
+    						var found = _.find(nArray, function(i) {
+        						return i.id === item.id;
+        					});
+        					if (found) {
+        						var index = nArray.indexOf(found);
+        						nArray.splice(index, 1);
+        					}
+    					}
+                    , 10000);
 				}
 
 				return item;

From 84e4189b45c519e703f3060c513e350c29f83ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 11:37:05 +0100
Subject: [PATCH 090/130] added margin and round corners to notifications

---
 .../less/components/notifications/umb-notifications.less | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
index 9e16eca414..7f04fef9a9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
@@ -22,7 +22,14 @@
     font-size: 14px;
     border: none;
     position: relative;
-    margin-bottom: 0;
+    border-radius: 10px;
+    margin: 10px;
+    
+    .close {
+        top: 0;
+        right: -6px;
+        opacity: 0.4;
+    }
 }
 
 .umb-notifications__notification.-extra-padding {

From 15d5c67cd3192ba65ff72ec4416ff7eeb8c3d22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 13:42:05 +0100
Subject: [PATCH 091/130] global text-color variables

---
 src/Umbraco.Web.UI.Client/src/less/variables.less | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 6400ae0321..55be161cf8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -112,7 +112,7 @@
 @blueExtraDark:         #1b264f;// added 2019
 @blueLight:             #ADD8E6;
 @blueNight:             #162335;// added 2019
-@orange:                #f79c37;// updated 2019
+//@orange:              #f79c37;// updated 2019
 @pink:                  #D93F4C;// #C3325F;// update 2019
 @pinkLight:             #f5c1bc;// added 2019
 @pinkRedLight:          #ff8a89;// added 2019
@@ -199,6 +199,16 @@
 .turquoise{color: @turquoise;}
 .turquoise-d1{color: @turquoise-d1;}
 
+.text-warning {
+    color: @orange;
+}
+.text-error {
+    color: @red;
+}
+.text-success {
+    color: @green;
+}
+
 
 //icon colors for tree icons
 .color-red, .color-red i{color: @red-d1 !important;}

From 0cc6e51b7a9ae3999a9ddfdaa089cc20e7186821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 13:43:03 +0100
Subject: [PATCH 092/130] simplify controller + only show text when near limit
 + different text when exceeding limit

---
 .../textarea/textarea.controller.js           | 24 +++-----------
 .../propertyeditors/textarea/textarea.html    |  9 ++++--
 .../textbox/textbox.controller.js             | 31 +++----------------
 .../propertyeditors/textbox/textbox.html      |  9 ++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  5 +--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  5 +--
 .../Umbraco/config/lang/en_us.xml             |  5 +--
 7 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
index 60d762738f..4934adb5dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
@@ -13,25 +13,11 @@ function textAreaController($scope) {
     $scope.model.maxlength = false;
     if ($scope.model.config && $scope.model.config.maxChars) {
         $scope.model.maxlength = true;
-        if($scope.model.value == undefined) {
-            $scope.model.count = ($scope.model.config.maxChars * 1);
-        } else {
-            $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-        }
     }
-
-    $scope.model.change = function() {
-        if ($scope.model.config && $scope.model.config.maxChars) {
-            if($scope.model.value == undefined) {
-                $scope.model.count = ($scope.model.config.maxChars * 1);
-            } else {
-                $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-            }
-            if($scope.model.count < 0) {
-                $scope.model.value = $scope.model.value.substring(0, ($scope.model.config.maxChars * 1));
-                $scope.model.count = 0;
-            }
-        }
+    
+    $scope.model.change = function () {
+        $scope.model.count = $scope.model.value.length;
     }
+    $scope.model.change();
 }
-angular.module('umbraco').controller("Umbraco.PropertyEditors.textAreaController", textAreaController);
\ No newline at end of file
+angular.module('umbraco').controller("Umbraco.PropertyEditors.textAreaController", textAreaController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 2fdca5d654..80da759fba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -7,9 +7,12 @@
             <span class="help-inline" ng-message="valServer">{{textareaFieldForm.textarea.errorMsg}}</span>
         </span>
 
-        <div class="help" ng-if="model.maxlength">
-            <strong>{{model.count}}</strong>
-            <localize key="textbox_characters_left">characters left</localize>
+        <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
+            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
         </div>
+        <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
+            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+        </div>
+
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
index 734903e46c..4ab827db59 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
@@ -4,39 +4,18 @@ function textboxController($scope) {
     if (!$scope.model.config) {
         $scope.model.config = {};
     }
-
-    $scope.model.maxlength = false;
-    if ($scope.model.config && $scope.model.config.maxChars) {
-        $scope.model.maxlength = true;
-    }
-
+    
     if (!$scope.model.config.maxChars) {
         // 500 is the maximum number that can be stored
         // in the database, so set it to the max, even
         // if no max is specified in the config
         $scope.model.config.maxChars = 500;
     }
-
-    if ($scope.model.maxlength) {
-        if ($scope.model.value === undefined) {
-            $scope.model.count = ($scope.model.config.maxChars * 1);
-        } else {
-            $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-        }
-    }
-
+    
     $scope.model.change = function () {
-        if ($scope.model.config && $scope.model.config.maxChars) {
-            if ($scope.model.value === undefined) {
-                $scope.model.count = ($scope.model.config.maxChars * 1);
-            } else {
-                $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-            }
-            if ($scope.model.count < 0) {
-                $scope.model.value = $scope.model.value.substring(0, ($scope.model.config.maxChars * 1));
-                $scope.model.count = 0;
-            }
-        }
+        $scope.model.count = $scope.model.value.length;
     }
+    $scope.model.change();
+    
 }
 angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 6f6ed6bdf6..0e041e7f34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -12,9 +12,12 @@
             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
         </span>
 
-        <div class="help" ng-if="model.maxlength">
-            <strong>{{model.count}}</strong>
-            <localize key="textbox_characters_left">characters left</localize>
+        <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
+            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
         </div>
+        <div class="help text-error" ng-if="model.count > model.config.maxChars">
+            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+        </div>
+
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 875948d4d2..11dcd6ac57 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1568,8 +1568,9 @@ Mange hilsner fra Umbraco robotten
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">Karakterer tilbage</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index fa6f689845..d10bc6ea0c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2078,8 +2078,9 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">characters left</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 6ff4d32f08..c04f639c3a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2090,8 +2090,9 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">characters left</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>

From 286978647eb57371bddee1b58a4a0026da8bce2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:04:31 +0100
Subject: [PATCH 093/130] fix type mistake, plus correcting math.

---
 .../src/views/propertyeditors/textarea/textarea.html          | 4 ++--
 .../src/views/propertyeditors/textbox/textbox.html            | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 80da759fba..e08668fb20 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 0e041e7f34..8385c951b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 11dcd6ac57..52be26e2fc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1569,7 +1569,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
     <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index d10bc6ea0c..218812270d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2079,7 +2079,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
     <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index c04f639c3a..9f578da1b6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2091,7 +2091,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
     <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">

From 50ee60e8c35eb4b8f4ed7fcf666950c369eb1ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:09:29 +0100
Subject: [PATCH 094/130] correcting translate tokens to use %

---
 .../src/views/propertyeditors/textarea/textarea.html          | 4 ++--
 .../src/views/propertyeditors/textbox/textbox.html            | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                 | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                 | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml              | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index e08668fb20..94935423e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 8385c951b1..6e8543de26 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 52be26e2fc..b7a8196e92 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1569,8 +1569,8 @@ Mange hilsner fra Umbraco robotten
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> tegn tilbage.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maksimum %0% tegn, <strong>%1%</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 218812270d..ab3a281114 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2079,8 +2079,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 9f578da1b6..9c66d1bef8 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2091,8 +2091,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>

From 118f6c7e50c1619bfb6e1f24b5832829754fbe4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:46:42 +0100
Subject: [PATCH 095/130] added the ability to watch tokens in localization
 service

---
 .../localization/localize.directive.js        | 19 +++++++---
 .../common/services/localization.service.js   | 36 +++++++++++++------
 .../propertyeditors/textarea/textarea.html    |  4 +--
 .../propertyeditors/textbox/textbox.html      |  4 +--
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
index c3093eee9e..df3770056e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
@@ -32,16 +32,27 @@ angular.module("umbraco.directives")
             restrict: 'E',
             scope:{
                 key: '@',
-                tokens: '='
+                tokens: '=',
+                watchTokens: '@'
             },
             replace: true,
 
             link: function (scope, element, attrs) {
                 var key = scope.key;
-                var tokens = scope.tokens ? scope.tokens : null;
-                localizationService.localize(key, tokens).then(function(value){
-                    element.html(value);
+                scope.text = "";
+                
+                // A render function to be able to update tokens as values update.
+                function render() {
+                    element.html(localizationService.tokenReplace(scope.text, scope.tokens || null));
+                }
+                
+                localizationService.localize(key).then(function(value){
+                    scope.text = value;
+                    render();
                 });
+                if (scope.watchTokens === 'true') {
+                    scope.$watch("tokens", render, true);
+                }
             }
         };
     })
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
index 2a9afdfa94..ea2ad73263 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
@@ -43,16 +43,11 @@ angular.module('umbraco.services')
 
         var entry = dictionary[value];
         if (entry) {
-            if (tokens) {
-                for (var i = 0; i < tokens.length; i++) {
-                    entry = entry.replace("%" + i + "%", tokens[i]);
-                }
-            }
-            return entry;
+            return service.tokenReplace(entry, tokens);
         }
         return "[" + value + "]";
     }
-
+    
     var service = {
         // array to hold the localized resource string entries
         dictionary: [],
@@ -127,7 +122,29 @@ angular.module('umbraco.services')
             }
             return value;
         },
-
+        
+        
+        /**
+         * @ngdoc method
+         * @name umbraco.services.localizationService#tokenReplace
+         * @methodOf umbraco.services.localizationService
+         *
+         * @description
+         * Helper to replace tokens
+         * @param {String} value the text-string to manipulate
+         * @param {Array} tekens An array of tokens values 
+         * @returns {String} Replaced test-string
+         */
+        tokenReplace: function (text, tokens) {
+            if (tokens) {
+                for (var i = 0; i < tokens.length; i++) {
+                    text = text.replace("%" + i + "%", tokens[i]);
+                }
+            }
+            return text;
+        },
+        
+        
         /**
          * @ngdoc method
          * @name umbraco.services.localizationService#localize
@@ -146,8 +163,7 @@ angular.module('umbraco.services')
          */
         localize: function (value, tokens) {
             return service.initLocalizedResources().then(function (dic) {
-                var val = _lookup(value, tokens, dic);
-                return val;
+                return _lookup(value, tokens, dic);
             });
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 94935423e8..1be37d92d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 6e8543de26..92f02b9f5b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>

From 64bae439bf7c735410bc3c95fe45dfb5e90762e3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 26 Mar 2019 08:44:03 +0100
Subject: [PATCH 096/130] Fix stuff from review

---
 src/Umbraco.Web/Security/MembershipHelper.cs | 24 ++++++++++----------
 src/Umbraco.Web/UmbracoHelper.cs             |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index c2d80257e1..bbcfc0760e 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -289,14 +289,14 @@ namespace Umbraco.Web.Security
             return MemberCache.GetByProviderKey(key);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByProviderKey(IEnumerable<object> keys)
+        public virtual IEnumerable<IPublishedContent> GetByProviderKeys(IEnumerable<object> keys)
         {
-            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByProviderKey(params object[] keys)
+        public virtual IEnumerable<IPublishedContent> GetByProviderKeys(params object[] keys)
         {
-            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
         public virtual IPublishedContent GetById(int memberId)
@@ -304,14 +304,14 @@ namespace Umbraco.Web.Security
             return MemberCache.GetById(memberId);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<int> memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<int> memberIds)
         {
-            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+            return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(params int[] memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(params int[] memberIds)
         {
-            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+            return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
         public virtual IPublishedContent GetById(Guid memberId)
@@ -319,14 +319,14 @@ namespace Umbraco.Web.Security
             return GetByProviderKey(memberId);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<Guid> memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<Guid> memberIds)
         {
-            return GetByProviderKey(memberIds.OfType<object>());
+            return GetByProviderKeys(memberIds.OfType<object>());
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(params Guid[] memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(params Guid[] memberIds)
         {
-            return GetByProviderKey(memberIds.OfType<object>());
+            return GetByProviderKeys(memberIds.OfType<object>());
         }
 
         public virtual IPublishedContent GetByUsername(string username)
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index e9fdfd73e5..80e3b95534 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -291,7 +291,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
@@ -301,7 +301,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
@@ -326,7 +326,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(params Guid[] ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(params Udi[] ids)

From 2bfa81c7079d28625a7f4b65bc5e6dbaa50d3b96 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 26 Mar 2019 20:07:42 +1100
Subject: [PATCH 097/130] fixes 4627 + makes front-end validations appear as
 soon as they are invalid again.

---
 .../directives/validation/valpropertymsg.directive.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 9ee83dc2ba..c027e0778e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -62,8 +62,8 @@ function valPropertyMsg(serverValidationManager) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-
-                            if (!newValue || angular.equals(newValue, oldValue)) {
+                            
+                            if (angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
@@ -78,10 +78,12 @@ function valPropertyMsg(serverValidationManager) {
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
-                                stopWatch();
+                            } else if (showValidation && scope.errorMsg === "") {
+                                formCtrl.$setValidity('valPropertyMsg', false);
+                                scope.errorMsg = getErrorMsg();
                             }
                         }, true);
                 }
@@ -152,6 +154,7 @@ function valPropertyMsg(serverValidationManager) {
                 showValidation = true;
                 if (hasError && scope.errorMsg === "") {
                     scope.errorMsg = getErrorMsg();
+                    startWatch();
                 }
                 else if (!hasError) {
                     scope.errorMsg = "";

From 080ace90b208b29ecca5e34bd0046fc7019d56ce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 26 Mar 2019 20:09:12 +1100
Subject: [PATCH 098/130] Bugfix:
 https://github.com/umbraco/Umbraco-CMS/issues/4827 - Fixed
 MediaPickerValueConverter when config is Only Images

---
 .../MediaPickerValueConverter.cs              | 58 +++++++++++++------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index 802f42ed9e..fb3134c9a3 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
@@ -14,11 +15,18 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter]
     public class MediaPickerValueConverter : PropertyValueConverterBase
     {
+        // hard-coding "image" here but that's how it works at UI level too
+        private const string ImageTypeAlias = "image";
+
+        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor)
+        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IPublishedModelFactory publishedModelFactory)
         {
-            _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
+            _publishedSnapshotAccessor = publishedSnapshotAccessor ??
+                                         throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
+            _publishedModelFactory = publishedModelFactory;
         }
 
         public override bool IsConverter(PublishedPropertyType propertyType)
@@ -31,15 +39,19 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             var isMultiple = IsMultipleDataType(propertyType.DataType);
             var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
-            // hard-coding "image" here but that's how it works at UI level too
-
             return isMultiple
-                ? (isOnlyImages ? typeof(IEnumerable<>).MakeGenericType(ModelType.For("image")) : typeof(IEnumerable<IPublishedContent>))
-                : (isOnlyImages ? ModelType.For("image") : typeof(IPublishedContent));
+                ? isOnlyImages
+                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
+                    : typeof(IEnumerable<IPublishedContent>)
+                : isOnlyImages
+                    ? ModelType.For(ImageTypeAlias)
+                    : typeof(IPublishedContent);
         }
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-            => PropertyCacheLevel.Snapshot;
+        {
+            return PropertyCacheLevel.Snapshot;
+        }
 
         private bool IsMultipleDataType(PublishedDataType dataType)
         {
@@ -53,26 +65,31 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.OnlyImages;
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType,
+            object source, bool preview)
         {
             if (source == null) return null;
 
             var nodeIds = source.ToString()
-                .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
                 .Select(Udi.Parse)
                 .ToArray();
             return nodeIds;
         }
 
-        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType,
+            PropertyCacheLevel cacheLevel, object source, bool preview)
         {
-            if (source == null)
-            {
-                return null;
-            }
+            var isMultiple = IsMultipleDataType(propertyType.DataType);
+            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
+
+            var udis = (Udi[]) source;
+            var mediaItems = isOnlyImages
+                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
+                : new List<IPublishedContent>();
+
+            if (source == null) return isMultiple ? mediaItems : null;
 
-            var udis = (Udi[])source;
-            var mediaItems = new List<IPublishedContent>();
             if (udis.Any())
             {
                 foreach (var udi in udis)
@@ -84,12 +101,15 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         mediaItems.Add(item);
                 }
 
-                if (IsMultipleDataType(propertyType.DataType))
-                    return mediaItems;
-                return mediaItems.FirstOrDefault();
+                return isMultiple ? mediaItems : FirstOrDefault(mediaItems);
             }
 
             return source;
         }
+
+        private object FirstOrDefault(IList mediaItems)
+        {
+            return mediaItems.Count == 0 ? null : mediaItems[0];
+        }
     }
 }

From 4fcf2ce7bdac14b49ca318021335d4fdd89ea252 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Mar 2019 08:17:09 +0100
Subject: [PATCH 099/130] Fixed issue when creating variant content templates,
 but the properties is invariant. Before this change an exception was thrown

---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 5bdc0959da..82ebd92f0b 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2875,7 +2875,14 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-                    content.SetValue(property.Alias, property.GetValue(culture), culture);
+                    if (property.PropertyType.VariesByCulture())
+                    {
+                        content.SetValue(property.Alias, property.GetValue(culture), culture);
+                    }
+                    else
+                    {
+                        content.SetValue(property.Alias, property.GetValue());
+                    }
                 }
 
                 content.Name = blueprint.Name;

From 8a56b3db163620a6c0e04bba6f0f1ca015eb06ee Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 17 Mar 2019 20:51:42 +0100
Subject: [PATCH 100/130] Fix the "Language" dropdown in the "Culture and
 Hostnames" dialog

---
 .../src/views/content/content.assigndomain.controller.js       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 0f27f3046c..5fa1eebd0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -46,8 +46,7 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language.Id);
-
+                            return matchLanguageById(l, data.language);
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];

From a70cb51559a225f6e13c38be3893759867c4e3e2 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:27:22 +0100
Subject: [PATCH 101/130] NuCache: cleanup scoped objects

---
 .../Scoping/ScopeContextualBase.cs            | 33 +++++++++++++++--
 .../NuCache/PublishedSnapshotService.cs       | 36 +++++++++----------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 7461142234..1f2b6155e6 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -2,24 +2,43 @@
 
 namespace Umbraco.Core.Scoping
 {
-    // base class for an object that will be enlisted in scope context, if any. it
-    // must be used in a 'using' block, and if not scoped, released when disposed,
-    // else when scope context runs enlisted actions
+    /// <summary>
+    /// Provides a base class for scope contextual objects.
+    /// </summary>
+    /// <remarks>
+    /// <para>A scope contextual object is enlisted in the current scope context,
+    /// if any, and released when the context exists. It must be used in a 'using'
+    /// block, and will be released when disposed, if not part of a scope.</para>
+    /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
         private bool _using, _scoped;
 
+        /// <summary>
+        /// Gets a contextual object.
+        /// </summary>
+        /// <typeparam name="T">The type of the object.</typeparam>
+        /// <param name="scopeProvider">A scope provider.</param>
+        /// <param name="key">A context key for the object.</param>
+        /// <param name="ctor">A function producing the contextual object.</param>
+        /// <returns>The contextual object.</returns>
+        /// <remarks>
+        /// <para></para>
+        /// </remarks>
         public static T Get<T>(IScopeProvider scopeProvider, string key, Func<bool, T> ctor)
             where T : ScopeContextualBase
         {
+            // no scope context = create a non-scoped object
             var scopeContext = scopeProvider.Context;
             if (scopeContext == null)
                 return ctor(false);
 
+            // create & enlist the scoped object
             var w = scopeContext.Enlist("ScopeContextualBase_" + key,
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
+            // the object can be 'used' only once at a time
             if (w._using) throw new InvalidOperationException("panic: used.");
             w._using = true;
             w._scoped = true;
@@ -27,6 +46,10 @@ namespace Umbraco.Core.Scoping
             return w;
         }
 
+        /// <inheritdoc />
+        /// <remarks>
+        /// <para>If not scoped, then this releases the contextual object.</para>
+        /// </remarks>
         public void Dispose()
         {
             _using = false;
@@ -35,6 +58,10 @@ namespace Umbraco.Core.Scoping
                 Release(true);
         }
 
+        /// <summary>
+        /// Releases the contextual object.
+        /// </summary>
+        /// <param name="completed">A value indicating whether the scoped operation completed.</param>
         public abstract void Release(bool completed);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e19531a25b..541ff2ea23 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -330,14 +330,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadContent(Action<IScope> action)
         {
+            // first get a writer, then a scope
+            // if there already is a scope, the writer will attach to it
+            // otherwise, it will only exist here - cheap
             using (_contentStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.ContentTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.ContentTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -399,14 +400,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadMedia(Action<IScope> action)
         {
+            // see note in LockAndLoadContent
             using (_mediaStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.MediaTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.MediaTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -528,14 +528,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadDomains()
         {
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.Domains);
-                    LoadDomainsLocked();
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.Domains);
+                LoadDomainsLocked();
+                scope.Complete();
             }
         }
 
@@ -858,6 +857,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_isReady == false)
                 return;
 
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
             {
                 foreach (var payload in payloads)

From 13a8548d3a19e6de90ef180a9f87115c80abf1c3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:30:55 +0100
Subject: [PATCH 102/130] NuCache: rename things

---
 .../Cache/SnapDictionaryTests.cs              | 10 ++--
 .../PublishedCache/NuCache/ContentStore.cs    | 56 ++++++++---------
 .../PublishedCache/NuCache/SnapDictionary.cs  | 60 +++++++++----------
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 013dbadbb8..0ee0d180c3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -388,8 +388,8 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenerationObject genObj;
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
+            SnapDictionary<int, string>.GenObj genObj;
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
@@ -399,14 +399,14 @@ namespace Umbraco.Tests.Cache
             GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakReference.IsAlive); // snapshot is gone, along with its reference
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
 
             await d.CollectAsync();
 
             Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
             Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenerationObjects.Count);
+            Assert.AreEqual(0, d.Test.GenObjs.Count);
             Assert.AreEqual(0, d.SnapCount); // snapshot is gone
             Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index b3996050a6..e78c4d419e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -29,8 +29,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
-        private readonly ConcurrentQueue<GenRefRef> _genRefRefs;
-        private GenRefRef _genRefRef;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -64,8 +64,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<PublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
             _xmap = new ConcurrentDictionary<Guid, int>();
 
-            _genRefRefs = new ConcurrentQueue<GenRefRef>();
-            _genRefRef = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -836,8 +836,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _genRefRef != null)
-                    return new Snapshot(this, _genRefRef.GetGenRef()
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                         , _logger
 #endif
@@ -852,15 +852,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_genRefRef == null)
-                        _genRefRefs.Enqueue(_genRefRef = new GenRefRef(snapGen));
-                    else if (_genRefRef.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _genRefRefs.Enqueue(_genRefRef = new GenRefRef(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -873,7 +873,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genRefRef.GetGenRef()
+                var snapshot = new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                     , _logger
 #endif
@@ -930,10 +930,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 #if DEBUG
             _logger.Debug<ContentStore>("Collect.");
 #endif
-            while (_genRefRefs.TryPeek(out GenRefRef genRefRef) && (genRefRef.Count == 0 || genRefRef.WGenRef.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _genRefRefs.TryDequeue(out genRefRef); // cannot fail since TryPeek has succeeded
-                _floorGen = genRefRef.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
 #if DEBUG
                 //_logger.Debug<ContentStore>("_floorGen=" + _floorGen + ", _liveGen=" + _liveGen);
 #endif
@@ -1009,9 +1009,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 await task;
         }
 
-        public long GenCount => _genRefRefs.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _genRefRefs.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -1100,7 +1100,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _store = store;
                 _genRef = genRef;
                 _gen = genRef.Gen;
-                Interlocked.Increment(ref genRef.GenRefRef.Count);
+                Interlocked.Increment(ref genRef.GenObj.Count);
                 //_thisCount = _count++;
 
 #if DEBUG
@@ -1201,46 +1201,46 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
 #if DEBUG
-                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenRefRef.Count.ToString() ?? "live");
+                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
-                    Interlocked.Decrement(ref _genRef.GenRefRef.Count);
+                    Interlocked.Decrement(ref _genRef.GenObj.Count);
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenRefRef
+        internal class GenObj
         {
-            public GenRefRef(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WGenRef = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
             public GenRef GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WGenRef.Target;
+                var genRef = (GenRef) WeakGenRef.Target;
                 if (genRef == null)
-                    WGenRef.Target = genRef = new GenRef(this, Gen);
+                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
                 return genRef;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WGenRef;
+            public readonly WeakReference WeakGenRef;
             public int Count;
         }
 
         internal class GenRef
         {
-            public GenRef(GenRefRef genRefRef, long gen)
+            public GenRef(GenObj genObj, long gen)
             {
-                GenRefRef = genRefRef;
+                GenObj = genObj;
                 Gen = gen;
             }
 
-            public readonly GenRefRef GenRefRef;
+            public readonly GenObj GenObj;
             public readonly long Gen;
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 30f6e7e638..eebbe3122f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // Readers are lock-free
 
         private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
-        private readonly ConcurrentQueue<GenerationObject> _generationObjects;
-        private GenerationObject _generationObject;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -41,8 +41,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public SnapDictionary()
         {
             _items = new ConcurrentDictionary<TKey, LinkedNode>();
-            _generationObjects = new ConcurrentQueue<GenerationObject>();
-            _generationObject = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -339,8 +339,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _generationObject != null)
-                    return new Snapshot(this, _generationObject.GetReference());
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef());
 
                 // else we need to try to create a new gen ref
                 // whether we are wlocked or not, noone can rlock while we do,
@@ -351,15 +351,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_generationObject == null)
-                        _generationObjects.Enqueue(_generationObject = new GenerationObject(snapGen));
-                    else if (_generationObject.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _generationObjects.Enqueue(_generationObject = new GenerationObject(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -372,7 +372,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _generationObject.GetReference());
+                var snapshot = new Snapshot(this, _genObj.GetGenRef());
 
                 // reading _floorGen is safe if _collectTask is null
                 if (_collectTask == null && _collectAuto && _liveGen - _floorGen > CollectMinGenDelta)
@@ -416,10 +416,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void Collect()
         {
             // see notes in CreateSnapshot
-            while (_generationObjects.TryPeek(out GenerationObject generationObject) && (generationObject.Count == 0 || generationObject.WeakReference.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _generationObjects.TryDequeue(out generationObject); // cannot fail since TryPeek has succeeded
-                _floorGen = generationObject.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
             }
 
             Collect(_items);
@@ -490,9 +490,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             //    await task;
         }
 
-        public long GenCount => _generationObjects.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _generationObjects.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -520,7 +520,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
-            public ConcurrentQueue<GenerationObject> GenerationObjects => _dict._generationObjects;
+            public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);
 
@@ -586,8 +586,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 _store = store;
                 _generationReference = generationReference;
-                _gen = generationReference.GenerationObject.Gen;
-                _generationReference.GenerationObject.Reference();
+                _gen = generationReference.GenObj.Gen;
+                _generationReference.GenObj.Reference();
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -634,30 +634,30 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
                 _gen = -1;
-                _generationReference?.GenerationObject.Release();
+                _generationReference?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenerationObject
+        internal class GenObj
         {
-            public GenerationObject(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WeakReference = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
-            public GenerationReference GetReference()
+            public GenerationReference GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakReference.Target;
+                var generationReference = (GenerationReference) WeakGenRef.Target;
                 if (generationReference == null)
-                    WeakReference.Target = generationReference = new GenerationReference(this);
+                    WeakGenRef.Target = generationReference = new GenerationReference(this);
                 return generationReference;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WeakReference;
+            public readonly WeakReference WeakGenRef;
             public int Count;
 
             public void Reference()
@@ -673,12 +673,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         internal class GenerationReference
         {
-            public GenerationReference(GenerationObject generationObject)
+            public GenerationReference(GenObj genObj)
             {
-                GenerationObject = generationObject;
+                GenObj = genObj;
             }
 
-            public readonly GenerationObject GenerationObject;
+            public readonly GenObj GenObj;
         }
 
         #endregion

From c56b8863eec4eb64504da614828a35bf4ec53e65 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 16:03:39 +0100
Subject: [PATCH 103/130] NuCache: reorg some classes

---
 .../Cache/SnapDictionaryTests.cs              |  4 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 53 +-----------
 .../PublishedCache/NuCache/Snap/GenObj.cs     | 37 +++++++++
 .../PublishedCache/NuCache/Snap/GenRef.cs     | 13 +++
 .../PublishedCache/NuCache/Snap/LinkedNode.cs | 20 +++++
 .../PublishedCache/NuCache/SnapDictionary.cs  | 80 +++----------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  3 +
 7 files changed, 87 insertions(+), 123 deletions(-)
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 0ee0d180c3..82c27ebc38 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -5,6 +5,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.Cache
 {
@@ -388,8 +389,7 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenObj genObj;
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index e78c4d419e..dd5805daa1 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -8,6 +8,7 @@ using CSharpTest.Net.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -1061,24 +1062,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode<TValue>
-            where TValue: class
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode<TValue> Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly ContentStore _store;
@@ -1210,40 +1193,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenRef GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WeakGenRef.Target;
-                if (genRef == null)
-                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
-                return genRef;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-        }
-
-        internal class GenRef
-        {
-            public GenRef(GenObj genObj, long gen)
-            {
-                GenObj = genObj;
-                Gen = gen;
-            }
-
-            public readonly GenObj GenObj;
-            public readonly long Gen;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
new file mode 100644
index 0000000000..b69dab7dac
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenObj
+    {
+        public GenObj(long gen)
+        {
+            Gen = gen;
+            WeakGenRef = new WeakReference(null);
+        }
+
+        public GenRef GetGenRef()
+        {
+            // not thread-safe but always invoked from within a lock
+            var genRef = (GenRef)WeakGenRef.Target;
+            if (genRef == null)
+                WeakGenRef.Target = genRef = new GenRef(this);
+            return genRef;
+        }
+
+        public readonly long Gen;
+        public readonly WeakReference WeakGenRef;
+        public int Count;
+
+        public void Reference()
+        {
+            Interlocked.Increment(ref Count);
+        }
+
+        public void Release()
+        {
+            Interlocked.Decrement(ref Count);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
new file mode 100644
index 0000000000..ade0251b8d
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenRef
+    {
+        public GenRef(GenObj genObj)
+        {
+            GenObj = genObj;
+        }
+
+        public readonly GenObj GenObj;
+        public long Gen => GenObj.Gen;
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
new file mode 100644
index 0000000000..20d7e7ddcd
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
@@ -0,0 +1,20 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class LinkedNode<TValue>
+        where TValue : class
+    {
+        public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
+        {
+            Value = value;
+            Gen = gen;
+            Next = next;
+        }
+
+        public readonly long Gen;
+
+        // reading & writing references is thread-safe on all .NET platforms
+        // mark as volatile to ensure we always read the correct value
+        public volatile TValue Value;
+        public volatile LinkedNode<TValue> Next;
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index eebbe3122f..f117a395b5 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -20,7 +21,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // This class is optimized for many readers, few writers
         // Readers are lock-free
 
-        private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
+        private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
         private readonly ConcurrentQueue<GenObj> _genObjs;
         private GenObj _genObj;
         private readonly object _wlocko = new object();
@@ -40,7 +41,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public SnapDictionary()
         {
-            _items = new ConcurrentDictionary<TKey, LinkedNode>();
+            _items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
             _genObjs = new ConcurrentQueue<GenObj>();
             _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
@@ -198,9 +199,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _items.Count;
 
-        private LinkedNode GetHead(TKey key)
+        private LinkedNode<TValue> GetHead(TKey key)
         {
-            _items.TryGetValue(key, out LinkedNode link); // else null
+            _items.TryGetValue(key, out var link); // else null
             return link;
         }
 
@@ -221,7 +222,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         // for an older gen - if value is different then insert a new
                         // link for the new gen, with the new value
                         if (link.Value != value)
-                            _items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
+                            _items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
                     }
                     else
                     {
@@ -235,7 +236,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
                 else
                 {
-                    _items.TryAdd(key, new LinkedNode(value, _liveGen));
+                    _items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
                 }
             }
             finally
@@ -261,7 +262,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (kvp.Value.Gen < _liveGen)
                     {
-                        var link = new LinkedNode(null, _liveGen, kvp.Value);
+                        var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
                         _items.TryUpdate(kvp.Key, link, kvp.Value);
                     }
                     else
@@ -425,7 +426,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Collect(_items);
         }
 
-        private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
+        private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
         {
             // it is OK to enumerate a concurrent dictionary and it does not lock
             // it - and here it's not an issue if we skip some items, they will be
@@ -460,7 +461,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // not live, null value, no next link = remove that one -- but only if
                     // the dict has not been updated, have to do it via ICollection<> (thanks
                     // Mr Toub) -- and if the dict has been updated there is nothing to collect
-                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
+                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
                     /*var removed =*/ idict.Remove(kvp);
                     //Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
                     continue;
@@ -526,7 +527,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public GenVal[] GetValues(TKey key)
             {
-                _dict._items.TryGetValue(key, out LinkedNode link); // else null
+                _dict._items.TryGetValue(key, out var link); // else null
 
                 if (link == null)
                     return new GenVal[0];
@@ -559,23 +560,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
@@ -639,48 +623,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenerationReference GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakGenRef.Target;
-                if (generationReference == null)
-                    WeakGenRef.Target = generationReference = new GenerationReference(this);
-                return generationReference;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-
-            public void Reference()
-            {
-                Interlocked.Increment(ref Count);
-            }
-
-            public void Release()
-            {
-                Interlocked.Decrement(ref Count);
-            }
-        }
-
-        internal class GenerationReference
-        {
-            public GenerationReference(GenObj genObj)
-            {
-                GenObj = genObj;
-            }
-
-            public readonly GenObj GenObj;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 09cc7d856a..c6cbc7cbaa 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -205,6 +205,9 @@
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />

From 7e413ed4060b5aab7c4197be79214a77e8e0f050 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:43:37 +0100
Subject: [PATCH 104/130] NuCache: troubleshooting

---
 .../Cache/SnapDictionaryTests.cs              | 174 ++++++++++++++++--
 .../PublishedCache/NuCache/ContentStore.cs    |   7 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 105 +++++++----
 3 files changed, 233 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 82c27ebc38..eb034eec26 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -712,16 +712,102 @@ namespace Umbraco.Tests.Cache
         }
 
         [Test]
-        public void NestedWriteLocking()
+        public void NestedWriteLocking1()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // no scope context: writers nest, last one to be disposed commits
+
+            var scopeProvider = GetScopeProvider();
+
+            using (var w1 = d.GetWriter(scopeProvider))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2); // get a new writer each time
+
+                    d.Set(1, "one");
+
+                    Assert.AreEqual(0, d.CreateSnapshot().Gen);
+                }
+
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                Assert.AreEqual(0, d.CreateSnapshot().Gen);
+            }
+
+            Assert.AreEqual(1, t.LiveGen);
+            Assert.AreEqual(0, t.WLocked);
+            Assert.IsTrue(t.NextGen);
+
+            Assert.AreEqual(1, d.CreateSnapshot().Gen);
+        }
+
+        [Test]
+        public void NestedWriteLocking2()
         {
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            var scopeProvider = GetScopeProvider();
-            using (d.GetWriter(scopeProvider))
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // scope context: writers enlist
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider))
             {
-                using (d.GetWriter(scopeProvider))
+                using (var w2 = d.GetWriter(scopeProvider))
                 {
+                    Assert.AreSame(w1, w2);
+
+                    d.Set(1, "one");
+                }
+            }
+        }
+
+        [Test]
+        public void NestedWriteLocking3()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider1 = GetScopeProvider();
+            var scopeProvider2 = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider1))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider2))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2);
+
                     d.Set(1, "one");
                 }
             }
@@ -846,7 +932,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProvider = GetScopeProvider(true);
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -867,7 +954,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            ((ScopeContext) scopeProvider.Context).ScopeExit(true);
+            scopeContext.ScopeExit(true);
 
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(3, s5.Gen);
@@ -878,7 +965,8 @@ namespace Umbraco.Tests.Cache
         public void ScopeLocking2()
         {
             var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+            var t = d.Test;
+            t.CollectAuto = false;
 
             // gen 1
             d.Set(1, "one");
@@ -891,10 +979,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProviderMock = new Mock<IScopeProvider>();
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+
             var scopeContext = new ScopeContext();
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -905,18 +994,72 @@ namespace Umbraco.Tests.Cache
                 Assert.AreEqual(2, s3.Gen);
                 Assert.AreEqual("uno", s3.Get(1));
 
+                // we made some changes, so a next gen is required
+                Assert.AreEqual(3, t.LiveGen);
+                Assert.IsTrue(t.NextGen);
+                Assert.AreEqual(1, t.WLocked);
+
                 // but live snapshot contains changes
-                var ls = d.Test.LiveSnapshot;
+                var ls = t.LiveSnapshot;
                 Assert.AreEqual("ein", ls.Get(1));
                 Assert.AreEqual(3, ls.Gen);
             }
 
+            // nothing is committed until scope exits
+            Assert.AreEqual(3, t.LiveGen);
+            Assert.IsTrue(t.NextGen);
+            Assert.AreEqual(1, t.WLocked);
+
+            // no changes until exit
             var s4 = d.CreateSnapshot();
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
+            // fixme - remove debugging code
+            /*
+            Exception caught = null;
+            var genFlip = 0;
+            var lckFlip = 0;
+            var thread = new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    for (var i = 0; i < 20; i++)
+                    {
+                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
+                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
+                        d.CreateSnapshot();
+                        System.Threading.Thread.Sleep(500);
+                    }
+                }
+                catch (Exception e)
+                {
+                    caught = e;
+                }
+            });
+            thread.Start();
+            */
+
             scopeContext.ScopeExit(false);
 
+            // fixme - remove debugging code
+            /*
+            thread.Join();
+
+            Assert.IsNull(caught); // but then how can it be not null?
+
+            Console.WriteLine(genFlip);
+            Console.WriteLine(lckFlip);
+            Assert.AreEqual(1, genFlip);
+            Assert.AreEqual(10, lckFlip);
+            */
+
+            // now things have changed
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+            Assert.AreEqual(0, t.WLocked);
+
+            // no changes since not completed
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(2, s5.Gen);
             Assert.AreEqual("uno", s5.Get(1));
@@ -955,12 +1098,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
-        private IScopeProvider GetScopeProvider(bool withContext = false)
+        private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
-            var scopeProviderMock = new Mock<IScopeProvider>();
-            var scopeContext = withContext ? new ScopeContext() : null;
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = Mock.Of<IScopeProvider>();
+            Mock.Get(scopeProvider)
+                .Setup(x => x.Context).Returns(scopeContext);
             return scopeProvider;
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index dd5805daa1..2548046e23 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -95,7 +95,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class ContentStoreWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private ContentStore _store;
+            private readonly ContentStore _store;
+            private int _released;
 
             public ContentStoreWriter(ContentStore store, bool scoped)
             {
@@ -105,9 +106,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_store== null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _store.Release(_lockinfo, completed);
-                _store = null;
             }
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index f117a395b5..1d462f1b76 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -90,7 +90,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class SnapDictionaryWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private SnapDictionary<TKey, TValue> _dictionary;
+            private readonly SnapDictionary<TKey, TValue> _dictionary;
+            private int _released;
 
             public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
@@ -100,14 +101,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_dictionary == null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _dictionary.Release(_lockinfo, completed);
-                _dictionary = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
+        // the dict is write-locked until the write-lock is released
+        //  which happens when it is disposed (non-scoped)
+        //  or when the scope context exits (scoped)
         public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
             return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
@@ -130,13 +135,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //RuntimeHelpers.PrepareConstrainedRegions();
                 try { } finally
                 {
+                    // increment the lock count, and register that this lock is counting
                     _wlocked++;
                     lockInfo.Count = true;
+
+                    // fixme - this comment: "ok to have holes in generation objects" is annoying
+                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
+                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
+                    //
+                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
+                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
+
                     if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                         _liveGen += 1;
                     }
                 }
@@ -154,6 +168,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
         {
+            // if the lock wasn't taken in the first place, do nothing
+            if (!lockInfo.Taken)
+                return;
+
             if (commit == false)
             {
                 var rtaken = false;
@@ -162,6 +180,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Monitor.Enter(_rlocko, ref rtaken);
                     try { } finally
                     {
+                        // forget about the temp. liveGen
                         _nextGen = false;
                         _liveGen -= 1;
                     }
@@ -184,8 +203,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
+            // fixme - pretend we need to do something that takes time
+            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
+
+            // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
-            if (lockInfo.Taken) Monitor.Exit(_wlocko);
+            Monitor.Exit(_wlocko);
         }
 
         private void Release(ReadLockInfo lockInfo)
@@ -338,12 +361,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 Lock(lockInfo);
 
-                // if no next generation is required, and we already have one,
-                // use it and create a new snapshot
+                // if no next generation is required, and we already have a gen object,
+                // use it to create a new snapshot
                 if (_nextGen == false && _genObj != null)
                     return new Snapshot(this, _genObj.GetGenRef());
 
-                // else we need to try to create a new gen ref
+                // else we need to try to create a new gen object
                 // whether we are wlocked or not, noone can rlock while we do,
                 // so _liveGen and _nextGen are safe
                 if (_wlocked > 0) // volatile, cannot ++ but could --
@@ -351,26 +374,32 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // write-locked, cannot use latest gen (at least 1) so use previous
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
-                    // create a new gen ref unless we already have it
+                    // create a new gen object if we don't already have one
+                    // (happens the first time a snapshot is created)
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+
+                    // fixme - getting a panic exception here
+                    // means _genObj != null, means _nextGen == true
+
+                    // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
-                    // not write-locked, can use latest gen, create a new gen ref
+                    // not write-locked, can use latest gen (_liveGen), create a corresponding new gen object
                     _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
                 // so...
-                // the genRefRef has a weak ref to the genRef, and is queued
-                // the snapshot has a ref to the genRef, which has a ref to the genRefRef
-                // when the snapshot is disposed, it decreases genRefRef counter
+                // the genObj has a weak ref to the genRef, and is queued
+                // the snapshot has a ref to the genRef, which has a ref to the genObj
+                // when the snapshot is disposed, it decreases genObj counter
                 // so after a while, one of these conditions is going to be true:
-                // - the genRefRef counter is zero because all snapshots have properly been disposed
-                // - the genRefRef weak ref is dead because all snapshots have been collected
+                // - genObj.Count is zero because all snapshots have properly been disposed
+                // - genObj.WeakGenRef is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
                 var snapshot = new Snapshot(this, _genObj.GetGenRef());
@@ -486,7 +515,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 task = _collectTask;
             }
-            return task ?? Task.FromResult(0);
+            return task ?? Task.CompletedTask;
             //if (task != null)
             //    await task;
         }
@@ -514,6 +543,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             public long LiveGen => _dict._liveGen;
             public long FloorGen => _dict._floorGen;
             public bool NextGen => _dict._nextGen;
+            public int WLocked => _dict._wlocked;
 
             public bool CollectAuto
             {
@@ -563,15 +593,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
-            private readonly GenerationReference _generationReference;
-            private long _gen; // copied for perfs
+            private readonly GenRef _genRef;
+            private readonly long _gen; // copied for perfs
+            private int _disposed;
 
-            internal Snapshot(SnapDictionary<TKey, TValue> store, GenerationReference generationReference)
+            //private static int _count;
+            //private readonly int _thisCount;
+
+            internal Snapshot(SnapDictionary<TKey, TValue> store, GenRef genRef)
             {
                 _store = store;
-                _generationReference = generationReference;
-                _gen = generationReference.GenObj.Gen;
-                _generationReference.GenObj.Reference();
+                _genRef = genRef;
+                _gen = genRef.GenObj.Gen;
+                _genRef.GenObj.Reference();
+                //_thisCount = _count++;
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -580,17 +615,21 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _gen = gen;
             }
 
+            private void EnsureNotDisposed()
+            {
+                if (_disposed > 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+            }
+
             public TValue Get(TKey key)
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.Get(key, _gen);
             }
 
             public IEnumerable<TValue> GetAll()
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.GetAll(_gen);
             }
 
@@ -598,8 +637,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _store.IsEmpty(_gen);
                 }
             }
@@ -608,17 +646,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _gen;
                 }
             }
 
             public void Dispose()
             {
-                if (_gen < 0) return;
-                _gen = -1;
-                _generationReference?.GenObj.Release();
+                if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
+                    return;
+                _genRef?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }

From 851c844c8b3268909b0939bb3ec8a5202ea554c5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 18:56:23 +0100
Subject: [PATCH 105/130] NuCache: fix panic exception

---
 .../Cache/SnapDictionaryTests.cs              | 81 +++++++++++++++++++
 .../PublishedCache/NuCache/ContentStore.cs    |  4 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 15 +---
 3 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index eb034eec26..e4ca35fbd3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -1098,6 +1098,87 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
+        [Test]
+        public void DontPanic()
+        {
+            var d = new SnapDictionary<int, string>();
+            d.Test.CollectAuto = false;
+
+            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+
+            // gen 1
+            d.Set(1, "one");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj); // set with lock
+
+            var s1 = d.CreateSnapshot();
+            Assert.IsFalse(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            Assert.AreEqual(1, s1.Gen);
+            Assert.AreEqual("one", s1.Get(1));
+
+            d.Set(1, "uno");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(2, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            // scopeProvider.Context == scopeContext -> writer is scoped
+            // writer is scope contextual and scoped
+            //  when disposed, nothing happens
+            //  when the context exists, the writer is released
+            using (d.GetWriter(scopeProvider))
+            {
+                d.Set(1, "ein");
+                Assert.IsTrue(d.Test.NextGen);
+                Assert.AreEqual(3, d.Test.LiveGen);
+                Assert.IsNotNull(d.Test.GenObj);
+                Assert.AreEqual(2, d.Test.GenObj.Gen);
+            }
+
+            // writer has not released
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+
+            // nothing changed
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+
+            // panic!
+            var s2 = d.CreateSnapshot();
+
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            // release writer
+            scopeContext.ScopeExit(true);
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            var s3 = d.CreateSnapshot();
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(3, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsFalse(d.Test.NextGen);
+        }
+
         private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
             var scopeProvider = Mock.Of<IScopeProvider>();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2548046e23..2b9c9bee4d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -133,11 +133,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _wlocked++;
                     lockInfo.Count = true;
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true;
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -214,7 +215,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 else
                     dictionary.TryUpdate(key, link.Next, link);
             }
-
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 1d462f1b76..73904d1452 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -139,18 +139,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _wlocked++;
                     lockInfo.Count = true;
 
-                    // fixme - this comment: "ok to have holes in generation objects" is annoying
-                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
-                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
-                    //
-                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
-                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
-
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true; // this is the ONLY place where _nextGen becomes true
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -379,9 +373,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
 
-                    // fixme - getting a panic exception here
-                    // means _genObj != null, means _nextGen == true
-
                     // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
@@ -551,6 +542,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
+            public GenObj GenObj => _dict._genObj;
+
             public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);

From dfe6f2029ac5d65aa8bac1c91f27bc0da5ca5253 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 19:48:44 +0100
Subject: [PATCH 106/130] NuCache: better fixing, cleanup

---
 .../Scoping/ScopeContextualBase.cs            |  7 +-
 .../Cache/SnapDictionaryTests.cs              | 67 +++++--------------
 .../PublishedCache/NuCache/ContentStore.cs    | 13 ++--
 .../NuCache/PublishedSnapshotService.cs       | 18 ++---
 .../PublishedCache/NuCache/SnapDictionary.cs  | 18 ++---
 5 files changed, 39 insertions(+), 84 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 1f2b6155e6..25f176d471 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Scoping
     /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
-        private bool _using, _scoped;
+        private bool _scoped;
 
         /// <summary>
         /// Gets a contextual object.
@@ -38,9 +38,6 @@ namespace Umbraco.Core.Scoping
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
-            // the object can be 'used' only once at a time
-            if (w._using) throw new InvalidOperationException("panic: used.");
-            w._using = true;
             w._scoped = true;
 
             return w;
@@ -52,8 +49,6 @@ namespace Umbraco.Core.Scoping
         /// </remarks>
         public void Dispose()
         {
-            _using = false;
-
             if (_scoped == false)
                 Release(true);
         }
diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index e4ca35fbd3..b435af9e77 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -632,7 +632,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(1, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 var s1 = d.CreateSnapshot();
 
@@ -685,7 +685,7 @@ namespace Umbraco.Tests.Cache
             Assert.IsFalse(d.Test.NextGen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -724,13 +724,13 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -770,9 +770,9 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreSame(w1, w2);
 
@@ -794,13 +794,13 @@ namespace Umbraco.Tests.Cache
             var scopeProvider1 = GetScopeProvider();
             var scopeProvider2 = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider1))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider1))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider2))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -850,7 +850,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -895,7 +895,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -935,7 +935,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -985,7 +985,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -1015,45 +1015,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            // fixme - remove debugging code
-            /*
-            Exception caught = null;
-            var genFlip = 0;
-            var lckFlip = 0;
-            var thread = new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    for (var i = 0; i < 20; i++)
-                    {
-                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
-                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
-                        d.CreateSnapshot();
-                        System.Threading.Thread.Sleep(500);
-                    }
-                }
-                catch (Exception e)
-                {
-                    caught = e;
-                }
-            });
-            thread.Start();
-            */
-
             scopeContext.ScopeExit(false);
 
-            // fixme - remove debugging code
-            /*
-            thread.Join();
-
-            Assert.IsNull(caught); // but then how can it be not null?
-
-            Console.WriteLine(genFlip);
-            Console.WriteLine(lckFlip);
-            Assert.AreEqual(1, genFlip);
-            Assert.AreEqual(10, lckFlip);
-            */
-
             // now things have changed
             Assert.AreEqual(2, t.LiveGen);
             Assert.IsFalse(t.NextGen);
@@ -1104,13 +1067,13 @@ namespace Umbraco.Tests.Cache
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+            Assert.IsNull(d.Test.GenObj);
 
             // gen 1
             d.Set(1, "one");
             Assert.IsTrue(d.Test.NextGen);
             Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj); // set with lock
+            Assert.IsNull(d.Test.GenObj);
 
             var s1 = d.CreateSnapshot();
             Assert.IsFalse(d.Test.NextGen);
@@ -1134,7 +1097,7 @@ namespace Umbraco.Tests.Cache
             // writer is scope contextual and scoped
             //  when disposed, nothing happens
             //  when the context exists, the writer is released
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 d.Set(1, "ein");
                 Assert.IsTrue(d.Test.NextGen);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2b9c9bee4d..7ab4a64f31 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -92,13 +92,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ContentStoreWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly ContentStore _store;
             private int _released;
 
-            public ContentStoreWriter(ContentStore store, bool scoped)
+            public ScopedWriteLock(ContentStore store, bool scoped)
             {
                 _store = store;
                 store.Lock(_lockinfo, scoped);
@@ -114,9 +114,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         // gets a scope contextual representing a locked writer to the dictionary
         // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -137,9 +137,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true;
                     }
                 }
             }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 541ff2ea23..9c5587fbd5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -333,7 +333,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // first get a writer, then a scope
             // if there already is a scope, the writer will attach to it
             // otherwise, it will only exist here - cheap
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.ContentTree);
@@ -401,7 +401,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadMedia(Action<IScope> action)
         {
             // see note in LockAndLoadContent
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.MediaTree);
@@ -529,7 +529,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadDomains()
         {
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.Domains);
@@ -586,7 +586,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool draftChanged2, out bool publishedChanged2);
                 draftChanged = draftChanged2;
@@ -682,7 +682,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool anythingChanged2);
                 anythingChanged = anythingChanged2;
@@ -803,7 +803,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
 
-            using (store.GetWriter(_scopeProvider))
+            using (store.GetScopedWriteLock(_scopeProvider))
             {
                 // ReSharper disable AccessToModifiedClosure
                 action(removedIds, refreshedIds, otherIds, newIds);
@@ -824,8 +824,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
-            using (_contentStore.GetWriter(_scopeProvider))
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
@@ -858,7 +858,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
 
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             {
                 foreach (var payload in payloads)
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 73904d1452..c5b1df1206 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -87,13 +87,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class SnapDictionaryWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly SnapDictionary<TKey, TValue> _dictionary;
             private int _released;
 
-            public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
+            public ScopedWriteLock(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
                 _dictionary = dictionary;
                 dictionary.Lock(_lockinfo, scoped);
@@ -108,14 +108,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
-        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
         // the dict is write-locked until the write-lock is released
         //  which happens when it is disposed (non-scoped)
         //  or when the scope context exits (scoped)
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -143,9 +141,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                     }
                 }
             }
@@ -197,9 +196,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
-            // fixme - pretend we need to do something that takes time
-            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
-
             // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
             Monitor.Exit(_wlocko);

From b36288b987cd37122da42f4b261b1ab5a90bcfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:11:01 +0100
Subject: [PATCH 107/130] infinity editing dim-layer for umb-modelcolumn

---
 src/Umbraco.Web.UI.Client/src/less/modals.less | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 771be1bc2a..8e88774613 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -55,6 +55,16 @@
 	position: absolute;;	
 }
 
+.--notInFront .umb-modalcolumn::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    background: rgba(0,0,0,.4);
+}
+
 /* re-align loader */
 .umb-modal .umb-loader-wrapper, .umb-modalcolumn .umb-loader-wrapper, .umb-dialog .umb-loader-wrapper{
     position:relative; 

From 458e51096151a1578e02241d9949ae547ebfa7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:13 +0100
Subject: [PATCH 108/130] remove double ;;

---
 src/Umbraco.Web.UI.Client/src/less/modals.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 771be1bc2a..f922d7d95a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -52,7 +52,7 @@
 	bottom: 0px;
 	left: 0px;
 	right: 0px;
-	position: absolute;;	
+	position: absolute;	
 }
 
 /* re-align loader */

From 4a14d45a64199673125e846d51f60b3e76a1216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:30 +0100
Subject: [PATCH 109/130] remove inline styling

---
 .../src/views/content/overlays/schedule.html              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 2bf290b752..42f6ae7b98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -27,7 +27,7 @@
                                 {{vm.variants[0].releaseDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].releaseDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                            <a ng-hide="vm.variants[0].releaseDate" href="">
                                 <localize key="content_setDate">Set date</localize>
                             </a>
                         </div>
@@ -59,7 +59,7 @@
                                 {{vm.variants[0].expireDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].expireDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                            <a ng-hide="vm.variants[0].expireDate" href="">
                                 <localize key="content_setDate">Set date</localize>
                             </a>
                         </div>
@@ -123,7 +123,7 @@
                                                     {{variant.releaseDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.releaseDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                                                <a ng-hide="variant.releaseDate" href="">
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>
@@ -149,7 +149,7 @@
                                                     {{variant.expireDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.expireDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                                                <a ng-hide="variant.expireDate" href="">
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>

From d6be02aaecd83823c8b0578a6314a807a86859af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:45 +0100
Subject: [PATCH 110/130] style set date input

---
 .../src/less/properties.less                  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index 916f1b5a3a..d3e69a2d79 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -16,6 +16,31 @@
     border-left: 1px solid @gray-10;
 }
 
+.date-wrapper__date .flatpickr-input > a {
+    
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 700;
+    padding: 5px 15px;
+    box-sizing: border-box;
+    min-width: 200px;
+    
+    color: @ui-action-discreet-type;
+    border: 1px dashed @ui-action-discreet-border;
+    border-radius: 3px;
+    
+    &:hover {
+        text-decoration: none;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        
+        localize {
+            text-decoration: none;
+        }
+    }
+}
+
 //------------------- HISTORY ------------------
 
 .history {

From 4d0d17eb1b856d5c8390bee5541ed6e87f04c4be Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 26 Mar 2019 15:11:05 +0100
Subject: [PATCH 111/130] Remove params overloads on MembershipHelper

---
 src/Umbraco.Web/Security/MembershipHelper.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index bbcfc0760e..cdf696c520 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -294,11 +294,6 @@ namespace Umbraco.Web.Security
             return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByProviderKeys(params object[] keys)
-        {
-            return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
-        }
-
         public virtual IPublishedContent GetById(int memberId)
         {
             return MemberCache.GetById(memberId);
@@ -309,11 +304,6 @@ namespace Umbraco.Web.Security
             return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByIds(params int[] memberIds)
-        {
-            return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
-        }
-
         public virtual IPublishedContent GetById(Guid memberId)
         {
             return GetByProviderKey(memberId);
@@ -324,11 +314,6 @@ namespace Umbraco.Web.Security
             return GetByProviderKeys(memberIds.OfType<object>());
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByIds(params Guid[] memberIds)
-        {
-            return GetByProviderKeys(memberIds.OfType<object>());
-        }
-
         public virtual IPublishedContent GetByUsername(string username)
         {
             return MemberCache.GetByUsername(username);

From 719a4a8b6a50b829e7b8ce1166a5afaafdde436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 27 Mar 2019 08:29:04 +0100
Subject: [PATCH 112/130] adjusted size

---
 src/Umbraco.Web.UI.Client/src/less/properties.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index d3e69a2d79..d206b2a413 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -22,7 +22,7 @@
     align-items: center;
     justify-content: center;
     font-weight: 700;
-    padding: 5px 15px;
+    padding: 4px 15px;
     box-sizing: border-box;
     min-width: 200px;
     

From 9b13d8f5d77e978d869086c3bebab6d04bed2644 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 27 Mar 2019 10:28:49 +0100
Subject: [PATCH 113/130] Stop logging useless errors in UriExtensions

---
 src/Umbraco.Core/UriExtensions.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 083ca90cc4..1198b26e0f 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -23,21 +23,21 @@ namespace Umbraco.Core
         /// <returns></returns>
         ///  <remarks>
         ///  There are some special routes we need to check to properly determine this:
-        /// 
+        ///
         ///      If any route has an extension in the path like .aspx = back office
-        /// 
+        ///
         ///      These are def back office:
         ///          /Umbraco/BackOffice     = back office
         ///          /Umbraco/Preview        = back office
         ///      If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
         ///      so we can only assume that it is not back office. This will occur if people use an UmbracoApiController for the backoffice
         ///      but do not inherit from UmbracoAuthorizedApiController and do not use [IsBackOffice] attribute.
-        /// 
+        ///
         ///      These are def front-end:
         ///          /Umbraco/Surface        = front-end
         ///          /Umbraco/Api            = front-end
         ///      But if we've got this far we'll just have to assume it's front-end anyways.
-        /// 
+        ///
         ///  </remarks>
         internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IGlobalSettings globalSettings)
         {
@@ -152,9 +152,9 @@ namespace Umbraco.Core
                 var toInclude = new[] {".aspx", ".ashx", ".asmx", ".axd", ".svc"};
                 return toInclude.Any(ext.InvariantEquals) == false;
             }
-            catch (ArgumentException ex)
+            catch (ArgumentException)
             {
-                Current.Logger.Error(typeof(UriExtensions), ex, "Failed to determine if request was client side");
+                Current.Logger.Debug(typeof(UriExtensions), "Failed to determine if request was client side (invalid chars in path \"{Path}\"?)", url.LocalPath);
                 return false;
             }
         }

From 8da9ecc9e4d0f967d9aea54674801b53ed13f85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 27 Mar 2019 12:49:03 +0100
Subject: [PATCH 114/130] date-wrapper styles for variants schedule publishing

---
 .../src/less/properties.less                  | 48 ++++++++++++++++++-
 .../src/views/content/overlays/schedule.html  | 28 ++---------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index d206b2a413..e14bb5c0d6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -30,7 +30,51 @@
     border: 1px dashed @ui-action-discreet-border;
     border-radius: 3px;
     
-    &:hover {
+    &:hover, &:focus {
+        text-decoration: none;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        
+        localize {
+            text-decoration: none;
+        }
+    }
+}
+
+//----- VARIANTS SCHEDULED PUBLISH ------
+
+.date-wrapper-mini {
+    display: flex;
+    flex-direction: row;
+}
+
+.date-wrapper-mini__date {
+    display: flex;
+    
+    margin-left: 5px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    
+    &:first-of-type {
+        margin-left: 0;
+    }
+}
+
+.date-wrapper-mini__date .flatpickr-input > a {
+    
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 700;
+    padding: 1px 15px;
+    box-sizing: border-box;
+    min-width: 180px;
+    
+    color: @ui-action-discreet-type;
+    border: 1px dashed @ui-action-discreet-border;
+    border-radius: 3px;
+    
+    &:hover, &:focus {
         text-decoration: none;
         color: @ui-action-discreet-type-hover;
         border-color: @ui-action-discreet-border-hover;
@@ -96,4 +140,4 @@
     .history-line {
         display: none;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 42f6ae7b98..8cdc4a0abc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -84,8 +84,8 @@
 
         <div class="umb-list umb-list--condensed">
 
-            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
-                <ng-form name="scheduleSelectorForm">
+            <div class="umb-list-item" ng-repeat="variant in vm.variants">
+                <ng-form name="scheduleSelectorForm" style="width:100%;">
                     <div class="flex">
 
                         <umb-checkbox
@@ -106,9 +106,9 @@
                                 </span>
                             </label>
 
-                            <div class="flex items-center" style="margin-top: 10px; margin-bottom: 10px;">
+                            <div class="date-wrapper-mini">
+                                <div class="date-wrapper-mini__date" ng-if="vm.dirtyVariantFilter(variant) && (variant.releaseDate || variant.save)">
 
-                                <div class="flex items-center" ng-if="variant.releaseDate || variant.save">
                                     <div style="font-size: 13px; margin-right: 5px;">Publish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.releaseDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px; margin-right: 10px;" ng-if="variant.save">
@@ -134,7 +134,7 @@
                                     </div>
                                 </div>
 
-                                <div class="flex items-center" ng-if="variant.expireDate || variant.save">
+                                <div class="date-wrapper-mini__date" ng-if="variant.expireDate || variant.save">
                                     <div style="font-size: 13px; margin-right: 5px;">Unpublish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.expireDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px;" ng-if="variant.save">
@@ -182,24 +182,6 @@
             <br />
         </div>
 
-        <div class="umb-list umb-list--condensed" ng-if="vm.hasPristineVariants">
-            <div style="margin-bottom: 15px; font-weight: bold;">
-                <p><localize key="content_publishedLanguages"></localize></p>
-            </div>
-
-            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.pristineVariantFilter track by variant.language.culture">
-                <div>
-                    <div style="margin-bottom: 2px;">
-                        <span>{{ variant.language.name }}</span>
-                    </div>
-                    <div class="umb-permission__description">
-                        <umb-variant-state variant="variant"></umb-variant-state>
-                        <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                    </div>
-                </div>
-            </div>
-        </div>
-
     </div>
 
 </div>

From 6d9ed6c59bb6cb55d97d25c03195ff23054de391 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 28 Mar 2019 12:46:54 +0100
Subject: [PATCH 115/130] Change Member to Members (plural) for methods
 returning multiple members

---
 src/Umbraco.Web/UmbracoHelper.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 80e3b95534..1c6eb28b92 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -289,52 +289,52 @@ namespace Umbraco.Web
             return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
         }
 
-        public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
+        public IEnumerable<IPublishedContent> Members(IEnumerable<int> ids)
         {
             return MembershipHelper.GetByIds(ids);
         }
 
-        public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
+        public IEnumerable<IPublishedContent> Members(IEnumerable<string> ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
+        public IEnumerable<IPublishedContent> Members(IEnumerable<Guid> ids)
         {
             return MembershipHelper.GetByIds(ids);
         }
 
-        public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
+        public IEnumerable<IPublishedContent> Members(IEnumerable<Udi> ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(IEnumerable<object> ids)
+        public IEnumerable<IPublishedContent> Members(IEnumerable<object> ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(params int[] ids)
+        public IEnumerable<IPublishedContent> Members(params int[] ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(params string[] ids)
+        public IEnumerable<IPublishedContent> Members(params string[] ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(params Guid[] ids)
+        public IEnumerable<IPublishedContent> Members(params Guid[] ids)
         {
             return MembershipHelper.GetByIds(ids);
         }
 
-        public IEnumerable<IPublishedContent> Member(params Udi[] ids)
+        public IEnumerable<IPublishedContent> Members(params Udi[] ids)
         {
             return ids.Select(Member).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> Member(params object[] ids)
+        public IEnumerable<IPublishedContent> Members(params object[] ids)
         {
             return ids.Select(Member).WhereNotNull();
         }

From d49d4bcdebe623af2ebff643ccc0a63d5b0258c3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 28 Mar 2019 17:10:41 +0100
Subject: [PATCH 116/130] Align the logviewer search icons to the right of the
 search field

---
 src/Umbraco.Web.UI.Client/src/views/logviewer/search.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index fad7698969..e22e8909d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -54,8 +54,8 @@
                             <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%;" placeholder="Search logs&hellip;" />
 
                             <!-- Save Search & Clear Search icon buttons -->
-                            <ins class="icon-rate" ng-if="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="float: left; position: absolute; top: 0; line-height: 32px; right: 160px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
-                            <ins class="icon-wrong" ng-if="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="float: left; position: absolute; top: 0; line-height: 32px; right: 140px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 20px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 0px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
 
                             <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top:0;">
                                 <span class="ng-binding">Example Searches</span>

From 6a69906fb6139b187b754371b5fd213c30d4ed20 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 28 Mar 2019 17:11:00 +0100
Subject: [PATCH 117/130] Make the "save search" dialog a little prettier

---
 .../common/overlays/logviewersearch/logviewersearch.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
index 464a24517a..8ee9d1aa64 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
@@ -6,6 +6,6 @@
 
     <p>
         <strong>Name:</strong><br/>
-        <input ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
+        <input style="width: 100%" ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
     </p>
-</div>
\ No newline at end of file
+</div>

From 07bb7ac0f7c9bebf57b0ba31d650d76ee896b217 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 29 Mar 2019 08:26:36 +0100
Subject: [PATCH 118/130] Add content.SetValue overload for posted files

---
 src/Umbraco.Core/ContentExtensions.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index f802c2d0d9..a7d40b0b7d 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -7,6 +7,7 @@ using System.Web;
 using System.Xml.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPoco.Expressions;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -52,8 +53,8 @@ namespace Umbraco.Core
             return ContentStatus.Unpublished;
         }
 
-        
-        
+
+
         #endregion
 
         /// <summary>
@@ -134,9 +135,14 @@ namespace Umbraco.Core
         /// <summary>
         /// Sets the posted file value of a property.
         /// </summary>
-        /// <remarks>This really is for FileUpload fields only, and should be obsoleted. For anything else,
-        /// you need to store the file by yourself using Store and then figure out
-        /// how to deal with auto-fill properties (if any) and thumbnails (if any) by yourself.</remarks>
+        public static void SetValue(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, HttpPostedFileBase postedFile, string culture = null, string segment = null)
+        {
+            content.SetValue(contentTypeBaseServiceProvider, propertyTypeAlias, postedFile.FileName, postedFile.InputStream, culture, segment);
+        }
+
+        /// <summary>
+        /// Sets the posted file value of a property.
+        /// </summary>
         public static void SetValue(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
             if (filename == null || filestream == null) return;

From cea8753ff28a3b6c695ffd10e183c9f4e6fb5e45 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 28 Mar 2019 12:10:59 +0100
Subject: [PATCH 119/130] Replace dynamic ViewBag with ViewData

---
 .../Umbraco/Install/Views/Index.cshtml        |  6 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  4 +-
 .../Umbraco/Views/Default.cshtml              |  4 +-
 .../Editors/BackOfficeController.cs           | 37 ++++------
 .../Install/Controllers/InstallController.cs  |  4 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 src/Umbraco.Web/ViewDataExtensions.cs         | 71 +++++++++++++++++++
 7 files changed, 95 insertions(+), 32 deletions(-)
 create mode 100644 src/Umbraco.Web/ViewDataExtensions.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
index 1d397bfd01..e74dbea217 100644
--- a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
@@ -7,7 +7,7 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <base href="@ViewBag.UmbracoBaseFolder/" />
+    <base href="@ViewData.GetUmbracoBaseFolder()/" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -66,8 +66,8 @@
         var Umbraco = {};
         Umbraco.Sys = {};
         Umbraco.Sys.ServerVariables = {
-            "installApiBaseUrl": "@ViewBag.InstallApiBaseUrl",
-            "umbracoBaseUrl": "@ViewBag.UmbracoBaseFolder"
+            "installApiBaseUrl": "@ViewData.GetInstallApiBaseUrl()",
+            "umbracoBaseUrl": "@ViewData.GetUmbracoBaseFolder()"
         };
     </script>
     <script src="lib/lazyload-js/lazyload.min.js"></script>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index fba9a83789..b7c1e6540c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -51,7 +51,7 @@
     @{
         var externalLoginUrl = Url.Action("ExternalLogin", "BackOffice", new
         {
-            area = ViewBag.UmbracoPath,
+            area = ViewData.GetUmbracoPath(),
             //Custom redirect URL since we don't want to just redirect to the back office since this is for authing upgrades
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
@@ -61,7 +61,7 @@
     <script type="text/javascript">
     document.angularReady = function (app) {
 
-        @Html.AngularValueExternalLoginInfoScript((IEnumerable<string>)ViewBag.ExternalSignInError)
+        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
         @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
 
     }
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index b6432166c9..790a62f271 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -112,12 +112,12 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }), Model.Features, Current.Configs.Global())
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Current.Configs.Global())
 
     <script>
 
         document.angularReady = function(app) {
-            @Html.AngularValueExternalLoginInfoScript((IEnumerable<string>)ViewBag.ExternalSignInError)
+            @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 9add60aade..7ed87c44dd 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -45,10 +45,6 @@ namespace Umbraco.Web.Editors
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        private const string TokenExternalSignInError = "ExternalSignInError";
-        private const string TokenPasswordResetCode = "PasswordResetCode";
-        private static readonly string[] TempDataTokenNames = { TokenExternalSignInError, TokenPasswordResetCode };
-
         public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
@@ -294,13 +290,13 @@ namespace Umbraco.Web.Editors
                 if (result)
                 {
                     //Add a flag and redirect for it to be displayed
-                    TempData[TokenPasswordResetCode] = new ValidatePasswordResetCodeModel { UserId = userId, ResetCode = resetCode };
+                    TempData[ViewDataExtensions.TokenPasswordResetCode] = new ValidatePasswordResetCodeModel { UserId = userId, ResetCode = resetCode };
                     return RedirectToLocal(Url.Action("Default", "BackOffice"));
                 }
             }
 
             //Add error and redirect for it to be displayed
-            TempData[TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
+            TempData[ViewDataExtensions.TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
             return RedirectToLocal(Url.Action("Default", "BackOffice"));
         }
 
@@ -314,7 +310,7 @@ namespace Umbraco.Web.Editors
             if (loginInfo == null)
             {
                 //Add error and redirect for it to be displayed
-                TempData[TokenExternalSignInError] = new[] { "An error occurred, could not get external login info" };
+                TempData[ViewDataExtensions.TokenExternalSignInError] = new[] { "An error occurred, could not get external login info" };
                 return RedirectToLocal(Url.Action("Default", "BackOffice"));
             }
 
@@ -325,7 +321,7 @@ namespace Umbraco.Web.Editors
             }
 
             //Add errors and redirect for it to be displayed
-            TempData[TokenExternalSignInError] = result.Errors;
+            TempData[ViewDataExtensions.TokenExternalSignInError] = result.Errors;
             return RedirectToLocal(Url.Action("Default", "BackOffice"));
         }
 
@@ -341,17 +337,12 @@ namespace Umbraco.Web.Editors
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
             if (externalSignInResponse == null) throw new ArgumentNullException("externalSignInResponse");
 
-            ViewBag.UmbracoPath = GlobalSettings.GetUmbracoMvcArea();
+            ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea());
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
-            foreach (var tempDataTokenName in TempDataTokenNames)
-            {
-                if (TempData[tempDataTokenName] != null)
-                {
-                    ViewData[tempDataTokenName] = TempData[tempDataTokenName];
-                    return defaultResponse();
-                }
-            }
+            if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
+                ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode))
+                return defaultResponse();
 
             //First check if there's external login info, if there's not proceed as normal
             var loginInfo = await OwinContext.Authentication.GetExternalLoginInfoAsync(
@@ -416,7 +407,7 @@ namespace Umbraco.Web.Editors
             {
                 if (await AutoLinkAndSignInExternalAccount(loginInfo, autoLinkOptions) == false)
                 {
-                    ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" };
+                    ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" });
                 }
 
                 //Remove the cookie otherwise this message will keep appearing
@@ -440,7 +431,7 @@ namespace Umbraco.Web.Editors
             //we are allowing auto-linking/creating of local accounts
             if (loginInfo.Email.IsNullOrWhiteSpace())
             {
-                ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." };
+                ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." });
             }
             else
             {
@@ -448,7 +439,7 @@ namespace Umbraco.Web.Editors
                 var foundByEmail = Services.UserService.GetByEmail(loginInfo.Email);
                 if (foundByEmail != null)
                 {
-                    ViewData[TokenExternalSignInError] = new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider };
+                    ViewData.SetExternalSignInError(new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider });
                 }
                 else
                 {
@@ -477,21 +468,21 @@ namespace Umbraco.Web.Editors
 
                     if (userCreationResult.Succeeded == false)
                     {
-                        ViewData[TokenExternalSignInError] = userCreationResult.Errors;
+                        ViewData.SetExternalSignInError(userCreationResult.Errors);
                     }
                     else
                     {
                         var linkResult = await UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login);
                         if (linkResult.Succeeded == false)
                         {
-                            ViewData[TokenExternalSignInError] = linkResult.Errors;
+                            ViewData.SetExternalSignInError(linkResult.Errors);
 
                             //If this fails, we should really delete the user since it will be in an inconsistent state!
                             var deleteResult = await UserManager.DeleteAsync(autoLinkUser);
                             if (deleteResult.Succeeded == false)
                             {
                                 //DOH! ... this isn't good, combine all errors to be shown
-                                ViewData[TokenExternalSignInError] = linkResult.Errors.Concat(deleteResult.Errors);
+                                ViewData.SetExternalSignInError(linkResult.Errors.Concat(deleteResult.Errors));
                             }
                         }
                         else
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index cd616be8db..f45e7a0ae0 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -60,10 +60,10 @@ namespace Umbraco.Web.Install.Controllers
             }
 
             // gen the install base url
-            ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup");
+            ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup"));
 
             // get the base umbraco folder
-            ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
+            ViewData.SetUmbracoBaseFolder(IOHelper.ResolveUrl(SystemDirectories.Umbraco));
 
             _installHelper.InstallStatus(false, "");
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index aea5d9376a..d0185c9d8d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -216,6 +216,7 @@
     <Compile Include="Models\TemplateQuery\OperatorFactory.cs" />
     <Compile Include="UmbracoContextFactory.cs" />
     <Compile Include="UmbracoContextReference.cs" />
+    <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerConfiguration.cs" />
diff --git a/src/Umbraco.Web/ViewDataExtensions.cs b/src/Umbraco.Web/ViewDataExtensions.cs
new file mode 100644
index 0000000000..e47171f1ba
--- /dev/null
+++ b/src/Umbraco.Web/ViewDataExtensions.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.Web.Mvc;
+
+namespace Umbraco.Web
+{
+    public static class ViewDataExtensions
+    {
+        public const string TokenUmbracoPath = "UmbracoPath";
+        public const string TokenInstallApiBaseUrl = "InstallApiBaseUrl";
+        public const string TokenUmbracoBaseFolder = "UmbracoBaseFolder";
+        public const string TokenExternalSignInError = "ExternalSignInError";
+        public const string TokenPasswordResetCode = "PasswordResetCode";
+
+        public static bool FromTempData(this ViewDataDictionary viewData, TempDataDictionary tempData, string token)
+        {
+            if (tempData[token] == null) return false;
+            viewData[token] = tempData[token];
+            return true;
+        }
+
+        public static string GetUmbracoPath(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenUmbracoPath];
+        }
+
+        public static void SetUmbracoPath(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenUmbracoPath] = value;
+        }
+
+        public static string GetInstallApiBaseUrl(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenInstallApiBaseUrl];
+        }
+
+        public static void SetInstallApiBaseUrl(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenInstallApiBaseUrl] = value;
+        }
+
+        public static string GetUmbracoBaseFolder(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenUmbracoBaseFolder];
+        }
+
+        public static void SetUmbracoBaseFolder(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenUmbracoBaseFolder] = value;
+        }
+
+        public static IEnumerable<string> GetExternalSignInError(this ViewDataDictionary viewData)
+        {
+            return (IEnumerable<string>)viewData[TokenExternalSignInError];
+        }
+
+        public static void SetExternalSignInError(this ViewDataDictionary viewData, IEnumerable<string> value)
+        {
+            viewData[TokenExternalSignInError] = value;
+        }
+
+        public static string GetPasswordResetCode(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenPasswordResetCode];
+        }
+
+        public static void SetPasswordResetCode(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenPasswordResetCode] = value;
+        }
+    }
+}

From f4bd0cd1f54f7dfe2ebca410ee7c07bb1bc0ffa8 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:06:23 +0000
Subject: [PATCH 120/130] Swapped all `System.Root` string conversions

to use the `System.RootString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.Root` is `-1`, it didn't need the culture invariant
conversion.
---
 src/Umbraco.Core/Models/UserExtensions.cs                 | 6 +++---
 .../Repositories/Implement/ContentTypeRepositoryBase.cs   | 2 +-
 src/Umbraco.Core/Services/Implement/ContentService.cs     | 2 +-
 src/Umbraco.Web/Editors/CodeFileController.cs             | 4 ++--
 src/Umbraco.Web/Models/Trees/TreeRootNode.cs              | 2 +-
 src/Umbraco.Web/Trees/ApplicationTreeController.cs        | 6 +++---
 src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs   | 4 ++--
 src/Umbraco.Web/Trees/ContentTreeController.cs            | 2 +-
 src/Umbraco.Web/Trees/ContentTreeControllerBase.cs        | 8 ++++----
 src/Umbraco.Web/Trees/ContentTypeTreeController.cs        | 2 +-
 src/Umbraco.Web/Trees/DataTypeTreeController.cs           | 2 +-
 src/Umbraco.Web/Trees/DictionaryTreeController.cs         | 4 ++--
 src/Umbraco.Web/Trees/FileSystemTreeController.cs         | 8 ++++----
 src/Umbraco.Web/Trees/MacrosTreeController.cs             | 4 ++--
 src/Umbraco.Web/Trees/MediaTreeController.cs              | 2 +-
 src/Umbraco.Web/Trees/MediaTypeTreeController.cs          | 2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs             | 4 ++--
 .../Trees/MemberTypeAndGroupTreeControllerBase.cs         | 2 +-
 src/Umbraco.Web/Trees/RelationTypeTreeController.cs       | 4 ++--
 src/Umbraco.Web/Trees/TemplatesTreeController.cs          | 4 ++--
 src/Umbraco.Web/Trees/TreeControllerBase.cs               | 2 +-
 21 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index f9aa1113b3..14f3cdaca8 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -151,7 +151,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasContentRootAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
         }
 
         internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
@@ -161,7 +161,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
         }
 
         internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
@@ -327,7 +327,7 @@ namespace Umbraco.Core.Models
                 ? entityService.GetAllPaths(objectType, asn).ToDictionary(x => x.Id, x => x.Path)
                 : new Dictionary<int, string>();
 
-            paths[Constants.System.Root] = Constants.System.Root.ToString(); // entityService does not get that one
+            paths[Constants.System.Root] = Constants.System.RootString; // entityService does not get that one
 
             var binPath = GetBinPath(objectType);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index e9b952f11d..924efa1e11 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // move to parent (or -1), update path, save
             moving.ParentId = parentId;
             var movingPath = moving.Path + ","; // save before changing
-            moving.Path = (container == null ? Constants.System.Root.ToString() : container.Path) + "," + moving.Id;
+            moving.Path = (container == null ? Constants.System.RootString : container.Path) + "," + moving.Id;
             moving.Level = container == null ? 1 : container.Level + 1;
             Save(moving);
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index f2bef52922..ef1d61d4a8 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -533,7 +533,7 @@ namespace Umbraco.Core.Services.Implement
             //null check otherwise we get exceptions
             if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
 
-            var rootId = Constants.System.Root.ToInvariantString();
+            var rootId = Constants.System.RootString;
             var ids = content.Path.Split(',')
                 .Where(x => x != rootId && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
             if (ids.Any() == false)
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index bd6b837c2c..3f1ffa55d9 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Web.Editors
 
             // if the parentId is root (-1) then we just need an empty string as we are
             // creating the path below and we don't want -1 in the path
-            if (parentId == Core.Constants.System.Root.ToInvariantString())
+            if (parentId == Core.Constants.System.RootString)
             {
                 parentId = string.Empty;
             }
@@ -276,7 +276,7 @@ namespace Umbraco.Web.Editors
             // Make sure that the root virtual path ends with '/'
             codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.EnsureEndsWith("/");
 
-            if (id != Core.Constants.System.Root.ToInvariantString())
+            if (id != Core.Constants.System.RootString)
             {
                 codeFileDisplay.VirtualPath += id.TrimStart("/").EnsureEndsWith("/");
                 //if it's not new then it will have a path, otherwise it won't
diff --git a/src/Umbraco.Web/Models/Trees/TreeRootNode.cs b/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
index 730f6e2962..e26dffe5e4 100644
--- a/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
+++ b/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Web.Models.Trees
     [DataContract(Name = "node", Namespace = "")]
     public sealed class TreeRootNode : TreeNode
     {
-        private static readonly string RootId = Core.Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+        private static readonly string RootId = Core.Constants.System.RootString;
         private bool _isGroup;
         private bool _isSingleNodeTree;
 
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 007fd53e60..f0a860496e 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Trees
                 //if there are no trees defined for this section but the section is defined then we can have a simple
                 //full screen section without trees
                 var name = Services.TextService.Localize("sections/" + application);
-                return TreeRootNode.CreateSingleTreeRoot(Constants.System.Root.ToInvariantString(), null, null, name, TreeNodeCollection.Empty, true);
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
             }
 
             // handle request for a specific tree / or when there is only one tree
@@ -114,7 +114,7 @@ namespace Umbraco.Web.Trees
 
                 // otherwise it's a section with all empty trees, aka a fullscreen section
                 // todo is this true? what if we just failed to TryGetRootNode on all of them? SD: Yes it's true but we should check the result of TryGetRootNode and throw?
-                return TreeRootNode.CreateSingleTreeRoot(Constants.System.Root.ToInvariantString(), null, null, name, TreeNodeCollection.Empty, true);
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
             }
 
             // for many groups
@@ -180,7 +180,7 @@ namespace Umbraco.Web.Trees
             var rootNode = await GetRootNode(tree, querystring);
 
             var sectionRoot = TreeRootNode.CreateSingleTreeRoot(
-                Constants.System.Root.ToInvariantString(),
+                Constants.System.RootString,
                 rootNode.ChildNodesUrl,
                 rootNode.MenuUrl,
                 rootNode.Name,
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 87a707102d..8c23a91d5a 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Trees
             var entities = Services.EntityService.GetChildren(Constants.System.Root, UmbracoObjectTypes.DocumentBlueprint).ToArray();
 
             //check if we're rendering the root in which case we'll render the content types that have blueprints
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //get all blueprint content types
                 var contentTypeAliases = entities.Select(x => ((ContentEntitySlim) x).ContentTypeAlias).Distinct();
@@ -91,7 +91,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index b90e1964b8..4249d1639e 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -109,7 +109,7 @@ namespace Umbraco.Web.Trees
 
         protected override MenuItemCollection PerformGetMenuForNode(string id, FormDataCollection queryStrings)
         {
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 var menu = new MenuItemCollection();
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index e521deca40..0c02dd6e46 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -120,7 +120,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            var rootIdString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var rootIdString = Constants.System.RootString;
             var hasAccessToRoot = UserStartNodes.Contains(Constants.System.Root);
 
             var startNodeId = queryStrings.HasKey(TreeQueryStringParameters.StartNodeId)
@@ -256,7 +256,7 @@ namespace Umbraco.Web.Trees
         protected sealed override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
             //check if we're rendering the root
-            if (id == Constants.System.Root.ToInvariantString() && UserStartNodes.Contains(Constants.System.Root))
+            if (id == Constants.System.RootString && UserStartNodes.Contains(Constants.System.Root))
             {
                 var altStartId = string.Empty;
 
@@ -264,7 +264,7 @@ namespace Umbraco.Web.Trees
                     altStartId = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
 
                 //check if a request has been made to render from a specific start node
-                if (string.IsNullOrEmpty(altStartId) == false && altStartId != "undefined" && altStartId != Constants.System.Root.ToString(CultureInfo.InvariantCulture))
+                if (string.IsNullOrEmpty(altStartId) == false && altStartId != "undefined" && altStartId != Constants.System.RootString)
                 {
                     id = altStartId;
                 }
@@ -272,7 +272,7 @@ namespace Umbraco.Web.Trees
                 var nodes = GetTreeNodesInternal(id, queryStrings);
 
                 //only render the recycle bin if we are not in dialog and the start id id still the root
-                if (IsDialog(queryStrings) == false && id == Constants.System.Root.ToInvariantString())
+                if (IsDialog(queryStrings) == false && id == Constants.System.RootString)
                 {
                     nodes.Add(CreateTreeNode(
                         RecycleBinId.ToInvariantString(),
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 66cb9fe36e..b8374f9d94 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 8a0a83d94f..a9e29697fc 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index 5f0b7b5df0..3f7b89bcdf 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Web.Trees
 
             Func<IDictionaryItem, string> ItemSort() => item => item.ItemKey;
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.AddRange(
                     Services.LocalizationService.GetRootDictionaryItems().OrderBy(ItemSort()).Select(
@@ -104,7 +104,7 @@ namespace Umbraco.Web.Trees
 
             menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
 
-            if (id != Constants.System.Root.ToInvariantString())
+            if (id != Constants.System.RootString)
                 menu.Items.Add<ActionDelete>(Services.TextService, true, opensDialog: true);
 
             menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 9aea6e03dd..6e21c8114f 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Web.Trees
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
                 ? HttpUtility.UrlDecode(id).TrimStart("/")
                 : "";
 
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Trees
         {
             var root = base.CreateRootNode(queryStrings);
             //check if there are any children
-            root.HasChildren = GetTreeNodes(Constants.System.Root.ToInvariantString(), queryStrings).Any();
+            root.HasChildren = GetTreeNodes(Constants.System.RootString, queryStrings).Any();
             return root;
         }
 
@@ -139,14 +139,14 @@ namespace Umbraco.Web.Trees
         protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
         {
             //if root node no need to visit the filesystem so lets just create the menu and return it
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 return GetMenuForRootNode(queryStrings);
             }
 
             var menu = new MenuItemCollection();
 
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
                 ? HttpUtility.UrlDecode(id).TrimStart("/")
                 : "";
 
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index 77b13416ff..02636cbea8 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 foreach (var macro in Services.MacroService.GetAll())
                 {
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //Create the normal create action
                 menu.Items.Add<ActionNew>(Services.TextService);
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 5797dd930d..fc3d23f092 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Web.Trees
             //set the default
             menu.DefaultMenuAlias = ActionNew.ActionAlias;
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // if the user's start node is not the root then the only menu item to display is refresh
                 if (UserStartNodes.Contains(Constants.System.Root) == false)
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 30db2ea12a..bb6b867751 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 6107540c0c..bb0091af54 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.Add(
                         CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), "icon-users", true,
@@ -148,7 +148,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 if (_provider.IsUmbracoMembershipProvider())
diff --git a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
index d3f9ee77c9..5e71266bca 100644
--- a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 menu.Items.Add(new CreateChildEntity(Services.TextService));
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index 82e07c5226..ab6dd39820 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //Create the normal create action
                 menu.Items.Add<ActionNew>(Services.TextService.Localize("actions", ActionNew.ActionAlias));
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.AddRange(Services.RelationService.GetAllRelationTypes()
                     .Select(rt => CreateTreeNode(rt.Id.ToString(), id, queryStrings, rt.Name,
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 916e5d4b4d..601964c30d 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            var found = id == Constants.System.Root.ToInvariantString()
+            var found = id == Constants.System.RootString
                 ? Services.FileService.GetTemplates(-1)
                 : Services.FileService.GetTemplates(int.Parse(id));
 
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Trees
             var item = menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
             item.NavigateToRoute($"{queryStrings.GetRequiredValue<string>("application")}/templates/edit/{id}?create=true");
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //refresh action
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 4e43e6c093..daa8300b4f 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -173,7 +173,7 @@ namespace Umbraco.Web.Trees
         /// <returns></returns>
         protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
         {
-            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var rootNodeAsString = Constants.System.RootString;
             var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
 
             var node = new TreeNode(

From 13564c72ef9342f520001f89f1459fa2a135072c Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:13:38 +0000
Subject: [PATCH 121/130] Replaced hardcoded "-1" with
 `Constants.System.RootString`

---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index ef1d61d4a8..5e1e0529b6 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1922,7 +1922,7 @@ namespace Umbraco.Core.Services.Implement
             // if uow is not immediate, content.Path will be updated only when the UOW commits,
             // and because we want it now, we have to calculate it by ourselves
             //paths[content.Id] = content.Path;
-            paths[content.Id] = (parent == null ? (parentId == Constants.System.RecycleBinContent ? "-1,-20" : "-1") : parent.Path) + "," + content.Id;
+            paths[content.Id] = (parent == null ? (parentId == Constants.System.RecycleBinContent ? "-1,-20" : Constants.System.RootString) : parent.Path) + "," + content.Id;
 
             const int pageSize = 500;
             var page = 0;

From a4c96678e5abc142f3c973183b5e9b04808d49e9 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:14:27 +0000
Subject: [PATCH 122/130] Swapped `System.RecycleBinContent` string conversions

to use the `System.RecycleBinContentString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.RecycleBinContentString` is `-20`, it didn't
need the culture invariant conversion.
---
 src/Umbraco.Core/Compose/RelateOnTrashComponent.cs | 2 +-
 src/Umbraco.Core/Models/UserExtensions.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
index 501907a6e7..1b32d36a71 100644
--- a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Compose
 
         private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
         {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContent.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
             {
                 var relationService = Current.Services.RelationService;
                 const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index 14f3cdaca8..b76f2656ad 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -156,7 +156,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContent.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContentString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
         }
 
         internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)

From 31e4701487d5c78da2af4145f520b81334ad014d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 29 Mar 2019 13:17:00 +0100
Subject: [PATCH 123/130] Re-style things so the saved searches link is inside
 the input field

---
 .../src/views/logviewer/search.html               | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index e22e8909d1..5981b41598 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -51,18 +51,19 @@
 
                         <div style="position:relative; width:100%;">
                             <!-- Search/expression filter -->
-                            <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%;" placeholder="Search logs&hellip;" />
+                            <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%; padding-right: 160px;" placeholder="Search logs&hellip;" />
 
                             <!-- Save Search & Clear Search icon buttons -->
-                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 20px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
-                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 0px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 140px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 120px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
 
-                            <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top:0;">
-                                <span class="ng-binding">Example Searches</span>
-                                <ins class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
+                            <!-- Saved Searches -->
+                            <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top: 1px; right: 0; position: absolute;">
+                                <span class="ng-binding">Saved Searches</span>
+                                <ins class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}" style="margin-top: 0;"></ins>
                             </a>
 
-                            <!-- Common Searches Dropdown -->
+                            <!-- Saved Searches Dropdown -->
                             <umb-dropdown ng-if="vm.dropdownOpen"  style="width: 100%; max-height: 250px; overflow-y: scroll; margin-top: -10px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                                 <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active}" ng-repeat="search in vm.searches">
                                     <a href="" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)" prevent-default>

From b44360aa99f33dcd8ae701fbc159c461e4447a5f Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:17:12 +0000
Subject: [PATCH 124/130] Swapped `System.RecycleBinMedia` string conversions

to use the `System.RecycleBinMediaString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.RecycleBinMedia` is `-21`, it didn't
need the culture invariant conversion.
---
 src/Umbraco.Core/Compose/RelateOnTrashComponent.cs | 2 +-
 src/Umbraco.Core/Models/UserExtensions.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
index 1b32d36a71..8371f9b279 100644
--- a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Compose
 
         private static void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
         {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMedia.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
             {
                 var relationService = Current.Services.RelationService;
                 const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index b76f2656ad..0f83cf78a4 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -166,7 +166,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMedia.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMediaString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
         }
 
         internal static bool HasPathAccess(this IUser user, IContent content, IEntityService entityService)

From 533d2cf8ddf4c312c44dfebf486fd5bd6ae847b0 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:18:52 +0000
Subject: [PATCH 125/130] Replaced hardcoded "-1" with
 `Constants.System.RootString`

---
 src/Umbraco.Core/Services/Implement/MediaService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index a1aea45f11..fa72896239 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -995,7 +995,7 @@ namespace Umbraco.Core.Services.Implement
             // if uow is not immediate, content.Path will be updated only when the UOW commits,
             // and because we want it now, we have to calculate it by ourselves
             //paths[media.Id] = media.Path;
-            paths[media.Id] = (parent == null ? (parentId == Constants.System.RecycleBinMedia ? "-1,-21" : "-1") : parent.Path) + "," + media.Id;
+            paths[media.Id] = (parent == null ? (parentId == Constants.System.RecycleBinMedia ? "-1,-21" : Constants.System.RootString) : parent.Path) + "," + media.Id;
 
             const int pageSize = 500;
             var page = 0;

From 0a687ab7ce59a16960d3c4be3e900c3ec369a4fd Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:26:42 +0000
Subject: [PATCH 126/130] Whitespace formatting in the Constants classes

Also removed unused namespaces.
---
 src/Umbraco.Core/Constants-AppSettings.cs     |   1 -
 src/Umbraco.Core/Constants-Applications.cs    |   4 +-
 src/Umbraco.Core/Constants-Conventions.cs     | 132 +++++++++---------
 src/Umbraco.Core/Constants-Icons.cs           |  12 +-
 src/Umbraco.Core/Constants-Indexes.cs         |   5 +-
 src/Umbraco.Core/Constants-ObjectTypes.cs     |   1 -
 .../Constants-PackageRepository.cs            |   2 +-
 src/Umbraco.Core/Constants-PropertyEditors.cs |   1 -
 src/Umbraco.Core/Constants-Web.cs             |   6 +-
 .../Persistence/Constants-DatabaseSchema.cs   |   2 +-
 src/Umbraco.Core/UdiEntityType.cs             |   2 +-
 11 files changed, 74 insertions(+), 94 deletions(-)

diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index ac0cbde8de..509be46b61 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -93,7 +93,6 @@ namespace Umbraco.Core
             /// </summary>
             public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";
 
-            
             /// <summary>
             /// Debug specific web.config AppSetting keys for Umbraco
             /// </summary>
diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index b53a2b8eaf..cf4f80d87b 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -145,11 +145,11 @@
 
             public const string PartialViewMacros = "partialViewMacros";
 
-			public const string LogViewer = "logViewer";
+            public const string LogViewer = "logViewer";
 
             public static class Groups
             {
-				public const string Settings = "settingsGroup";
+                public const string Settings = "settingsGroup";
 
                 public const string Templating = "templatingGroup";
 
diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index d49244d9f9..6c9407667a 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -92,10 +92,10 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string Extension = "umbracoExtension";
 
-				/// <summary>
-				/// The default height/width of an image file if the size can't be determined from the metadata
-				/// </summary>
-				public const int DefaultSize = 200;
+                /// <summary>
+                /// The default height/width of an image file if the size can't be determined from the metadata
+                /// </summary>
+                public const int DefaultSize = 200;
             }
 
             /// <summary>
@@ -209,71 +209,71 @@ namespace Umbraco.Core
                 public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
                 {
                     return new Dictionary<string, PropertyType>
+                    {
                         {
+                            Comments,
+                            new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
                             {
-                                Comments,
-                                new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
-                                    {
-                                        Name = CommentsLabel
-                                    }
-                            },
-                            {
-                                FailedPasswordAttempts,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
-                                    {
-                                        Name = FailedPasswordAttemptsLabel
-                                    }
-                            },
-                            {
-                                IsApproved,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
-                                    {
-                                        Name = IsApprovedLabel
-                                    }
-                            },
-                            {
-                                IsLockedOut,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
-                                    {
-                                        Name = IsLockedOutLabel
-                                    }
-                            },
-                            {
-                                LastLockoutDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
-                                    {
-                                        Name = LastLockoutDateLabel
-                                    }
-                            },
-                            {
-                                LastLoginDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
-                                    {
-                                        Name = LastLoginDateLabel
-                                    }
-                            },
-                            {
-                                LastPasswordChangeDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
-                                    {
-                                        Name = LastPasswordChangeDateLabel
-                                    }
-                            },
-                            {
-                                PasswordAnswer,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
-                                    {
-                                        Name = PasswordAnswerLabel
-                                    }
-                            },
-                            {
-                                PasswordQuestion,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
-                                    {
-                                        Name = PasswordQuestionLabel
-                                    }
+                                Name = CommentsLabel
                             }
-                        };
+                        },
+                        {
+                            FailedPasswordAttempts,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
+                            {
+                                Name = FailedPasswordAttemptsLabel
+                            }
+                        },
+                        {
+                            IsApproved,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
+                            {
+                                Name = IsApprovedLabel
+                            }
+                        },
+                        {
+                            IsLockedOut,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
+                            {
+                                Name = IsLockedOutLabel
+                            }
+                        },
+                        {
+                            LastLockoutDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
+                            {
+                                Name = LastLockoutDateLabel
+                            }
+                        },
+                        {
+                            LastLoginDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
+                            {
+                                Name = LastLoginDateLabel
+                            }
+                        },
+                        {
+                            LastPasswordChangeDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
+                            {
+                                Name = LastPasswordChangeDateLabel
+                            }
+                        },
+                        {
+                            PasswordAnswer,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
+                            {
+                                Name = PasswordAnswerLabel
+                            }
+                        },
+                        {
+                            PasswordQuestion,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
+                            {
+                                Name = PasswordQuestionLabel
+                            }
+                        }
+                    };
                 }
             }
 
diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
index f74b44b70b..d3e8b4ad3b 100644
--- a/src/Umbraco.Core/Constants-Icons.cs
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
         public static class Icons
         {
-
-
             /// <summary>
             /// System contenttype icon
             /// </summary>
@@ -42,12 +34,10 @@ namespace Umbraco.Core
             /// </summary>
             public const string MemberType = "icon-users";
 
-
             /// <summary>
             /// System member icon
             /// </summary>
             public const string Template = "icon-layout";
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-Indexes.cs b/src/Umbraco.Core/Constants-Indexes.cs
index c73a170b62..1add0f721b 100644
--- a/src/Umbraco.Core/Constants-Indexes.cs
+++ b/src/Umbraco.Core/Constants-Indexes.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
index 4bf944e1e1..9a6a1a0632 100644
--- a/src/Umbraco.Core/Constants-ObjectTypes.cs
+++ b/src/Umbraco.Core/Constants-ObjectTypes.cs
@@ -123,7 +123,6 @@ namespace Umbraco.Core
             public static readonly Guid Template = new Guid(Strings.Template);
 
             public static readonly Guid ContentItem = new Guid(Strings.ContentItem);
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-PackageRepository.cs b/src/Umbraco.Core/Constants-PackageRepository.cs
index 59005b3e2c..42cf61f982 100644
--- a/src/Umbraco.Core/Constants-PackageRepository.cs
+++ b/src/Umbraco.Core/Constants-PackageRepository.cs
@@ -3,7 +3,7 @@
     public static partial class Constants
     {
         /// <summary>
-        ///     Defines the constants used for the Umbraco package repository
+        /// Defines the constants used for the Umbraco package repository
         /// </summary>
         public static class PackageRepository
         {
diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 32f9407616..0c2e246721 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -34,7 +34,6 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string ContentPicker = "Umbraco.ContentPicker";
 
-   
                 /// <summary>
                 /// DateTime.
                 /// </summary>
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 0da5431e91..64216ba571 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
@@ -22,7 +19,6 @@ namespace Umbraco.Core
             public const string PreviewCookieName = "UMB_PREVIEW";
 
             public const string InstallerCookieName = "umb_installId";
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
index b62a99ce83..272158551d 100644
--- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
+++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Core
 
                 public const string Tag = /*TableNamePrefix*/ "cms" + "Tags";
                 public const string TagRelationship = /*TableNamePrefix*/ "cms" + "TagRelationship";
-                
+
                 public const string KeyValue = TableNamePrefix + "KeyValue";
 
                 public const string AuditEntry = TableNamePrefix + "Audit";
diff --git a/src/Umbraco.Core/UdiEntityType.cs b/src/Umbraco.Core/UdiEntityType.cs
index 86197ce6a8..75a137bd2e 100644
--- a/src/Umbraco.Core/UdiEntityType.cs
+++ b/src/Umbraco.Core/UdiEntityType.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core
 
             internal static Dictionary<string, UdiType> GetTypes()
             {
-                return new Dictionary<string,UdiType>
+                return new Dictionary<string, UdiType>
                 {
                     { Unknown, UdiType.Unknown },
 

From 043f4f3d02cfd000a799b93e412858b481ead139 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Apr 2019 14:20:47 +1100
Subject: [PATCH 127/130] Revert "Merge remote-tracking branch 'origin/v8/8.0'
 into temp8-4011"

This reverts commit e73cf590b7f7af8f6f31cb495fca11a7964965b3, reversing
changes made to 89903a633b2762dd6da017a53d05963a76a6886c.
---
 build/NuSpecs/UmbracoCms.Core.nuspec          |   2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec           |   2 +-
 build/NuSpecs/UmbracoCms.nuspec               |   2 +-
 .../Scoping/ScopeContextualBase.cs            |  38 +--
 .../Services/Implement/ContentService.cs      |   9 +-
 .../Cache/SnapDictionaryTests.cs              | 240 ++----------------
 .../validation/valpropertymsg.directive.js    |  11 +-
 .../src/preview/preview.controller.js         |   7 +-
 .../content.assigndomain.controller.js        |   3 +-
 .../MediaPickerValueConverter.cs              |  58 ++---
 .../PublishedCache/NuCache/ContentStore.cs    | 113 ++++++---
 .../NuCache/PublishedSnapshotService.cs       |  54 ++--
 .../PublishedCache/NuCache/Snap/GenObj.cs     |  37 ---
 .../PublishedCache/NuCache/Snap/GenRef.cs     |  13 -
 .../PublishedCache/NuCache/Snap/LinkedNode.cs |  20 --
 .../PublishedCache/NuCache/SnapDictionary.cs  | 218 +++++++++-------
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 -
 17 files changed, 298 insertions(+), 532 deletions(-)
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 11b1870b90..b257f8dcdd 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index e81c199288..79113a7c94 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index c93a82c691..8ec1484452 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>
diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 25f176d471..7461142234 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -2,61 +2,39 @@
 
 namespace Umbraco.Core.Scoping
 {
-    /// <summary>
-    /// Provides a base class for scope contextual objects.
-    /// </summary>
-    /// <remarks>
-    /// <para>A scope contextual object is enlisted in the current scope context,
-    /// if any, and released when the context exists. It must be used in a 'using'
-    /// block, and will be released when disposed, if not part of a scope.</para>
-    /// </remarks>
+    // base class for an object that will be enlisted in scope context, if any. it
+    // must be used in a 'using' block, and if not scoped, released when disposed,
+    // else when scope context runs enlisted actions
     public abstract class ScopeContextualBase : IDisposable
     {
-        private bool _scoped;
+        private bool _using, _scoped;
 
-        /// <summary>
-        /// Gets a contextual object.
-        /// </summary>
-        /// <typeparam name="T">The type of the object.</typeparam>
-        /// <param name="scopeProvider">A scope provider.</param>
-        /// <param name="key">A context key for the object.</param>
-        /// <param name="ctor">A function producing the contextual object.</param>
-        /// <returns>The contextual object.</returns>
-        /// <remarks>
-        /// <para></para>
-        /// </remarks>
         public static T Get<T>(IScopeProvider scopeProvider, string key, Func<bool, T> ctor)
             where T : ScopeContextualBase
         {
-            // no scope context = create a non-scoped object
             var scopeContext = scopeProvider.Context;
             if (scopeContext == null)
                 return ctor(false);
 
-            // create & enlist the scoped object
             var w = scopeContext.Enlist("ScopeContextualBase_" + key,
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
+            if (w._using) throw new InvalidOperationException("panic: used.");
+            w._using = true;
             w._scoped = true;
 
             return w;
         }
 
-        /// <inheritdoc />
-        /// <remarks>
-        /// <para>If not scoped, then this releases the contextual object.</para>
-        /// </remarks>
         public void Dispose()
         {
+            _using = false;
+
             if (_scoped == false)
                 Release(true);
         }
 
-        /// <summary>
-        /// Releases the contextual object.
-        /// </summary>
-        /// <param name="completed">A value indicating whether the scoped operation completed.</param>
         public abstract void Release(bool completed);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index f2bef52922..cc962fbe22 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2875,14 +2875,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-                    if (property.PropertyType.VariesByCulture())
-                    {
-                        content.SetValue(property.Alias, property.GetValue(culture), culture);
-                    }
-                    else
-                    {
-                        content.SetValue(property.Alias, property.GetValue());
-                    }
+                    content.SetValue(property.Alias, property.GetValue(culture), culture);
                 }
 
                 content.Name = blueprint.Name;
diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index b435af9e77..013dbadbb8 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -5,7 +5,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.Cache
 {
@@ -389,7 +388,8 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
+            SnapDictionary<int, string>.GenerationObject genObj;
+            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
@@ -399,14 +399,14 @@ namespace Umbraco.Tests.Cache
             GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
+            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
+            Assert.IsFalse(genObj.WeakReference.IsAlive); // snapshot is gone, along with its reference
 
             await d.CollectAsync();
 
             Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
             Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenObjs.Count);
+            Assert.AreEqual(0, d.Test.GenerationObjects.Count);
             Assert.AreEqual(0, d.SnapCount); // snapshot is gone
             Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
         }
@@ -632,7 +632,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(1, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            using (d.GetScopedWriteLock(GetScopeProvider()))
+            using (d.GetWriter(GetScopeProvider()))
             {
                 var s1 = d.CreateSnapshot();
 
@@ -685,7 +685,7 @@ namespace Umbraco.Tests.Cache
             Assert.IsFalse(d.Test.NextGen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            using (d.GetScopedWriteLock(GetScopeProvider()))
+            using (d.GetWriter(GetScopeProvider()))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -712,102 +712,16 @@ namespace Umbraco.Tests.Cache
         }
 
         [Test]
-        public void NestedWriteLocking1()
-        {
-            var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // no scope context: writers nest, last one to be disposed commits
-
-            var scopeProvider = GetScopeProvider();
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider))
-            {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                using (var w2 = d.GetScopedWriteLock(scopeProvider))
-                {
-                    Assert.AreEqual(1, t.LiveGen);
-                    Assert.AreEqual(2, t.WLocked);
-                    Assert.IsTrue(t.NextGen);
-
-                    Assert.AreNotSame(w1, w2); // get a new writer each time
-
-                    d.Set(1, "one");
-
-                    Assert.AreEqual(0, d.CreateSnapshot().Gen);
-                }
-
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                Assert.AreEqual(0, d.CreateSnapshot().Gen);
-            }
-
-            Assert.AreEqual(1, t.LiveGen);
-            Assert.AreEqual(0, t.WLocked);
-            Assert.IsTrue(t.NextGen);
-
-            Assert.AreEqual(1, d.CreateSnapshot().Gen);
-        }
-
-        [Test]
-        public void NestedWriteLocking2()
+        public void NestedWriteLocking()
         {
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // scope context: writers enlist
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider))
+            var scopeProvider = GetScopeProvider();
+            using (d.GetWriter(scopeProvider))
             {
-                using (var w2 = d.GetScopedWriteLock(scopeProvider))
+                using (d.GetWriter(scopeProvider))
                 {
-                    Assert.AreSame(w1, w2);
-
-                    d.Set(1, "one");
-                }
-            }
-        }
-
-        [Test]
-        public void NestedWriteLocking3()
-        {
-            var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider1 = GetScopeProvider();
-            var scopeProvider2 = GetScopeProvider(scopeContext);
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider1))
-            {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
-                {
-                    Assert.AreEqual(1, t.LiveGen);
-                    Assert.AreEqual(2, t.WLocked);
-                    Assert.IsTrue(t.NextGen);
-
-                    Assert.AreNotSame(w1, w2);
-
                     d.Set(1, "one");
                 }
             }
@@ -850,7 +764,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -895,7 +809,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -932,10 +846,9 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
+            var scopeProvider = GetScopeProvider(true);
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -954,7 +867,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            scopeContext.ScopeExit(true);
+            ((ScopeContext) scopeProvider.Context).ScopeExit(true);
 
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(3, s5.Gen);
@@ -965,8 +878,7 @@ namespace Umbraco.Tests.Cache
         public void ScopeLocking2()
         {
             var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
+            d.Test.CollectAuto = false;
 
             // gen 1
             d.Set(1, "one");
@@ -979,13 +891,12 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-
+            var scopeProviderMock = new Mock<IScopeProvider>();
             var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
+            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
+            var scopeProvider = scopeProviderMock.Object;
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -994,35 +905,18 @@ namespace Umbraco.Tests.Cache
                 Assert.AreEqual(2, s3.Gen);
                 Assert.AreEqual("uno", s3.Get(1));
 
-                // we made some changes, so a next gen is required
-                Assert.AreEqual(3, t.LiveGen);
-                Assert.IsTrue(t.NextGen);
-                Assert.AreEqual(1, t.WLocked);
-
                 // but live snapshot contains changes
-                var ls = t.LiveSnapshot;
+                var ls = d.Test.LiveSnapshot;
                 Assert.AreEqual("ein", ls.Get(1));
                 Assert.AreEqual(3, ls.Gen);
             }
 
-            // nothing is committed until scope exits
-            Assert.AreEqual(3, t.LiveGen);
-            Assert.IsTrue(t.NextGen);
-            Assert.AreEqual(1, t.WLocked);
-
-            // no changes until exit
             var s4 = d.CreateSnapshot();
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
             scopeContext.ScopeExit(false);
 
-            // now things have changed
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-            Assert.AreEqual(0, t.WLocked);
-
-            // no changes since not completed
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(2, s5.Gen);
             Assert.AreEqual("uno", s5.Get(1));
@@ -1061,92 +955,12 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
-        [Test]
-        public void DontPanic()
+        private IScopeProvider GetScopeProvider(bool withContext = false)
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.IsNull(d.Test.GenObj);
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNull(d.Test.GenObj);
-
-            var s1 = d.CreateSnapshot();
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
-
-            // scopeProvider.Context == scopeContext -> writer is scoped
-            // writer is scope contextual and scoped
-            //  when disposed, nothing happens
-            //  when the context exists, the writer is released
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                d.Set(1, "ein");
-                Assert.IsTrue(d.Test.NextGen);
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsNotNull(d.Test.GenObj);
-                Assert.AreEqual(2, d.Test.GenObj.Gen);
-            }
-
-            // writer has not released
-            Assert.AreEqual(1, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-
-            // nothing changed
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-
-            // panic!
-            var s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            // release writer
-            scopeContext.ScopeExit(true);
-
-            Assert.AreEqual(0, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            var s3 = d.CreateSnapshot();
-
-            Assert.AreEqual(0, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(3, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-        }
-
-        private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
-        {
-            var scopeProvider = Mock.Of<IScopeProvider>();
-            Mock.Get(scopeProvider)
-                .Setup(x => x.Context).Returns(scopeContext);
+            var scopeProviderMock = new Mock<IScopeProvider>();
+            var scopeContext = withContext ? new ScopeContext() : null;
+            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
+            var scopeProvider = scopeProviderMock.Object;
             return scopeProvider;
         }
     }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index c027e0778e..9ee83dc2ba 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -62,8 +62,8 @@ function valPropertyMsg(serverValidationManager) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-                            
-                            if (angular.equals(newValue, oldValue)) {
+
+                            if (!newValue || angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
@@ -78,12 +78,10 @@ function valPropertyMsg(serverValidationManager) {
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
-                            } else if (showValidation && scope.errorMsg === "") {
-                                formCtrl.$setValidity('valPropertyMsg', false);
-                                scope.errorMsg = getErrorMsg();
+                                stopWatch();
                             }
                         }, true);
                 }
@@ -154,7 +152,6 @@ function valPropertyMsg(serverValidationManager) {
                 showValidation = true;
                 if (hasError && scope.errorMsg === "") {
                     scope.errorMsg = getErrorMsg();
-                    startWatch();
                 }
                 else if (!hasError) {
                     scope.errorMsg = "";
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 4733c58556..7d6584d2f1 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -113,12 +113,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId;
-            
-            if(culture){
-                relativeUrl +='?culture='+ culture;
-            }
-            
+            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 5fa1eebd0b..0f27f3046c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -46,7 +46,8 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language);
+                            return matchLanguageById(l, data.language.Id);
+
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index fb3134c9a3..802f42ed9e 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
@@ -15,18 +14,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter]
     public class MediaPickerValueConverter : PropertyValueConverterBase
     {
-        // hard-coding "image" here but that's how it works at UI level too
-        private const string ImageTypeAlias = "image";
-
-        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor,
-            IPublishedModelFactory publishedModelFactory)
+        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor)
         {
-            _publishedSnapshotAccessor = publishedSnapshotAccessor ??
-                                         throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
-            _publishedModelFactory = publishedModelFactory;
+            _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
         }
 
         public override bool IsConverter(PublishedPropertyType propertyType)
@@ -39,19 +31,15 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             var isMultiple = IsMultipleDataType(propertyType.DataType);
             var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
+            // hard-coding "image" here but that's how it works at UI level too
+
             return isMultiple
-                ? isOnlyImages
-                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
-                    : typeof(IEnumerable<IPublishedContent>)
-                : isOnlyImages
-                    ? ModelType.For(ImageTypeAlias)
-                    : typeof(IPublishedContent);
+                ? (isOnlyImages ? typeof(IEnumerable<>).MakeGenericType(ModelType.For("image")) : typeof(IEnumerable<IPublishedContent>))
+                : (isOnlyImages ? ModelType.For("image") : typeof(IPublishedContent));
         }
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-        {
-            return PropertyCacheLevel.Snapshot;
-        }
+            => PropertyCacheLevel.Snapshot;
 
         private bool IsMultipleDataType(PublishedDataType dataType)
         {
@@ -65,31 +53,26 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.OnlyImages;
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType,
-            object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
         {
             if (source == null) return null;
 
             var nodeIds = source.ToString()
-                .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
                 .Select(Udi.Parse)
                 .ToArray();
             return nodeIds;
         }
 
-        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType,
-            PropertyCacheLevel cacheLevel, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object source, bool preview)
         {
-            var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
-
-            var udis = (Udi[]) source;
-            var mediaItems = isOnlyImages
-                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
-                : new List<IPublishedContent>();
-
-            if (source == null) return isMultiple ? mediaItems : null;
+            if (source == null)
+            {
+                return null;
+            }
 
+            var udis = (Udi[])source;
+            var mediaItems = new List<IPublishedContent>();
             if (udis.Any())
             {
                 foreach (var udi in udis)
@@ -101,15 +84,12 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         mediaItems.Add(item);
                 }
 
-                return isMultiple ? mediaItems : FirstOrDefault(mediaItems);
+                if (IsMultipleDataType(propertyType.DataType))
+                    return mediaItems;
+                return mediaItems.FirstOrDefault();
             }
 
             return source;
         }
-
-        private object FirstOrDefault(IList mediaItems)
-        {
-            return mediaItems.Count == 0 ? null : mediaItems[0];
-        }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 7ab4a64f31..b3996050a6 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -8,7 +8,6 @@ using CSharpTest.Net.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -30,8 +29,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
-        private readonly ConcurrentQueue<GenObj> _genObjs;
-        private GenObj _genObj;
+        private readonly ConcurrentQueue<GenRefRef> _genRefRefs;
+        private GenRefRef _genRefRef;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -65,8 +64,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<PublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
             _xmap = new ConcurrentDictionary<Guid, int>();
 
-            _genObjs = new ConcurrentQueue<GenObj>();
-            _genObj = null; // no initial gen exists
+            _genRefRefs = new ConcurrentQueue<GenRefRef>();
+            _genRefRef = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -92,13 +91,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ScopedWriteLock : ScopeContextualBase
+        private class ContentStoreWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private readonly ContentStore _store;
-            private int _released;
+            private ContentStore _store;
 
-            public ScopedWriteLock(ContentStore store, bool scoped)
+            public ContentStoreWriter(ContentStore store, bool scoped)
             {
                 _store = store;
                 store.Lock(_lockinfo, scoped);
@@ -106,17 +104,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
-                    return;
+                if (_store== null) return;
                 _store.Release(_lockinfo, completed);
+                _store = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
         // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
-        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
+        public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -133,14 +131,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _wlocked++;
                     lockInfo.Count = true;
-                    if (_nextGen == false || (forceGen && _wlocked == 1))
+                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        if (_nextGen)
-                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
-                        _liveGen += 1;
                         _nextGen = true;
+                        _liveGen += 1;
                     }
                 }
             }
@@ -216,6 +212,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 else
                     dictionary.TryUpdate(key, link.Next, link);
             }
+
         }
 
         #endregion
@@ -839,8 +836,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _genObj != null)
-                    return new Snapshot(this, _genObj.GetGenRef()
+                if (_nextGen == false && _genRefRef != null)
+                    return new Snapshot(this, _genRefRef.GetGenRef()
 #if DEBUG
                         , _logger
 #endif
@@ -855,15 +852,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_genObj == null)
-                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
-                    else if (_genObj.Gen != snapGen)
+                    if (_genRefRef == null)
+                        _genRefRefs.Enqueue(_genRefRef = new GenRefRef(snapGen));
+                    else if (_genRefRef.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                    _genRefRefs.Enqueue(_genRefRef = new GenRefRef(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -876,7 +873,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genObj.GetGenRef()
+                var snapshot = new Snapshot(this, _genRefRef.GetGenRef()
 #if DEBUG
                     , _logger
 #endif
@@ -933,10 +930,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 #if DEBUG
             _logger.Debug<ContentStore>("Collect.");
 #endif
-            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
+            while (_genRefRefs.TryPeek(out GenRefRef genRefRef) && (genRefRef.Count == 0 || genRefRef.WGenRef.IsAlive == false))
             {
-                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
-                _floorGen = genObj.Gen;
+                _genRefRefs.TryDequeue(out genRefRef); // cannot fail since TryPeek has succeeded
+                _floorGen = genRefRef.Gen;
 #if DEBUG
                 //_logger.Debug<ContentStore>("_floorGen=" + _floorGen + ", _liveGen=" + _liveGen);
 #endif
@@ -1012,9 +1009,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 await task;
         }
 
-        public long GenCount => _genObjs.Count;
+        public long GenCount => _genRefRefs.Count;
 
-        public long SnapCount => _genObjs.Sum(x => x.Count);
+        public long SnapCount => _genRefRefs.Sum(x => x.Count);
 
         #endregion
 
@@ -1064,6 +1061,24 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
+        private class LinkedNode<TValue>
+            where TValue: class
+        {
+            public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
+            {
+                Value = value;
+                Gen = gen;
+                Next = next;
+            }
+
+            internal readonly long Gen;
+
+            // reading & writing references is thread-safe on all .NET platforms
+            // mark as volatile to ensure we always read the correct value
+            internal volatile TValue Value;
+            internal volatile LinkedNode<TValue> Next;
+        }
+
         public class Snapshot : IDisposable
         {
             private readonly ContentStore _store;
@@ -1085,7 +1100,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _store = store;
                 _genRef = genRef;
                 _gen = genRef.Gen;
-                Interlocked.Increment(ref genRef.GenObj.Count);
+                Interlocked.Increment(ref genRef.GenRefRef.Count);
                 //_thisCount = _count++;
 
 #if DEBUG
@@ -1186,15 +1201,49 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
 #if DEBUG
-                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
+                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenRefRef.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
-                    Interlocked.Decrement(ref _genRef.GenObj.Count);
+                    Interlocked.Decrement(ref _genRef.GenRefRef.Count);
                 GC.SuppressFinalize(this);
             }
         }
 
+        internal class GenRefRef
+        {
+            public GenRefRef(long gen)
+            {
+                Gen = gen;
+                WGenRef = new WeakReference(null);
+            }
+
+            public GenRef GetGenRef()
+            {
+                // not thread-safe but always invoked from within a lock
+                var genRef = (GenRef) WGenRef.Target;
+                if (genRef == null)
+                    WGenRef.Target = genRef = new GenRef(this, Gen);
+                return genRef;
+            }
+
+            public readonly long Gen;
+            public readonly WeakReference WGenRef;
+            public int Count;
+        }
+
+        internal class GenRef
+        {
+            public GenRef(GenRefRef genRefRef, long gen)
+            {
+                GenRefRef = genRefRef;
+                Gen = gen;
+            }
+
+            public readonly GenRefRef GenRefRef;
+            public readonly long Gen;
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 9c5587fbd5..e19531a25b 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -330,15 +330,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadContent(Action<IScope> action)
         {
-            // first get a writer, then a scope
-            // if there already is a scope, the writer will attach to it
-            // otherwise, it will only exist here - cheap
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_contentStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.ContentTree);
-                action(scope);
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.ContentTree);
+                    action(scope);
+                    scope.Complete();
+                }
             }
         }
 
@@ -400,13 +399,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadMedia(Action<IScope> action)
         {
-            // see note in LockAndLoadContent
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.MediaTree);
-                action(scope);
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.MediaTree);
+                    action(scope);
+                    scope.Complete();
+                }
             }
         }
 
@@ -528,13 +528,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadDomains()
         {
-            // see note in LockAndLoadContent
-            using (_domainStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_domainStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.Domains);
-                LoadDomainsLocked();
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.Domains);
+                    LoadDomainsLocked();
+                    scope.Complete();
+                }
             }
         }
 
@@ -586,7 +587,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            using (_contentStore.GetWriter(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool draftChanged2, out bool publishedChanged2);
                 draftChanged = draftChanged2;
@@ -682,7 +683,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool anythingChanged2);
                 anythingChanged = anythingChanged2;
@@ -803,7 +804,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
 
-            using (store.GetScopedWriteLock(_scopeProvider))
+            using (store.GetWriter(_scopeProvider))
             {
                 // ReSharper disable AccessToModifiedClosure
                 action(removedIds, refreshedIds, otherIds, newIds);
@@ -824,8 +825,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+            using (_contentStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
                 // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
@@ -857,8 +858,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_isReady == false)
                 return;
 
-            // see note in LockAndLoadContent
-            using (_domainStore.GetScopedWriteLock(_scopeProvider))
+            using (_domainStore.GetWriter(_scopeProvider))
             {
                 foreach (var payload in payloads)
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
deleted file mode 100644
index b69dab7dac..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class GenObj
-    {
-        public GenObj(long gen)
-        {
-            Gen = gen;
-            WeakGenRef = new WeakReference(null);
-        }
-
-        public GenRef GetGenRef()
-        {
-            // not thread-safe but always invoked from within a lock
-            var genRef = (GenRef)WeakGenRef.Target;
-            if (genRef == null)
-                WeakGenRef.Target = genRef = new GenRef(this);
-            return genRef;
-        }
-
-        public readonly long Gen;
-        public readonly WeakReference WeakGenRef;
-        public int Count;
-
-        public void Reference()
-        {
-            Interlocked.Increment(ref Count);
-        }
-
-        public void Release()
-        {
-            Interlocked.Decrement(ref Count);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
deleted file mode 100644
index ade0251b8d..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class GenRef
-    {
-        public GenRef(GenObj genObj)
-        {
-            GenObj = genObj;
-        }
-
-        public readonly GenObj GenObj;
-        public long Gen => GenObj.Gen;
-    }
-}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
deleted file mode 100644
index 20d7e7ddcd..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class LinkedNode<TValue>
-        where TValue : class
-    {
-        public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
-        {
-            Value = value;
-            Gen = gen;
-            Next = next;
-        }
-
-        public readonly long Gen;
-
-        // reading & writing references is thread-safe on all .NET platforms
-        // mark as volatile to ensure we always read the correct value
-        public volatile TValue Value;
-        public volatile LinkedNode<TValue> Next;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index c5b1df1206..30f6e7e638 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core.Scoping;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -21,9 +20,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // This class is optimized for many readers, few writers
         // Readers are lock-free
 
-        private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
-        private readonly ConcurrentQueue<GenObj> _genObjs;
-        private GenObj _genObj;
+        private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
+        private readonly ConcurrentQueue<GenerationObject> _generationObjects;
+        private GenerationObject _generationObject;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -41,9 +40,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public SnapDictionary()
         {
-            _items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
-            _genObjs = new ConcurrentQueue<GenObj>();
-            _genObj = null; // no initial gen exists
+            _items = new ConcurrentDictionary<TKey, LinkedNode>();
+            _generationObjects = new ConcurrentQueue<GenerationObject>();
+            _generationObject = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -87,13 +86,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ScopedWriteLock : ScopeContextualBase
+        private class SnapDictionaryWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private readonly SnapDictionary<TKey, TValue> _dictionary;
-            private int _released;
+            private SnapDictionary<TKey, TValue> _dictionary;
 
-            public ScopedWriteLock(SnapDictionary<TKey, TValue> dictionary, bool scoped)
+            public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
                 _dictionary = dictionary;
                 dictionary.Lock(_lockinfo, scoped);
@@ -101,19 +99,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
-                    return;
+                if (_dictionary == null) return;
                 _dictionary.Release(_lockinfo, completed);
+                _dictionary = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // the dict is write-locked until the write-lock is released
-        //  which happens when it is disposed (non-scoped)
-        //  or when the scope context exits (scoped)
-        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
+        // GetScopedWriter? should the dict have a ref onto the scope provider?
+        public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -133,18 +129,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //RuntimeHelpers.PrepareConstrainedRegions();
                 try { } finally
                 {
-                    // increment the lock count, and register that this lock is counting
                     _wlocked++;
                     lockInfo.Count = true;
-
-                    if (_nextGen == false || (forceGen && _wlocked == 1))
+                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        if (_nextGen)
-                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        _nextGen = true;
                         _liveGen += 1;
-                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                     }
                 }
             }
@@ -161,10 +153,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
         {
-            // if the lock wasn't taken in the first place, do nothing
-            if (!lockInfo.Taken)
-                return;
-
             if (commit == false)
             {
                 var rtaken = false;
@@ -173,7 +161,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Monitor.Enter(_rlocko, ref rtaken);
                     try { } finally
                     {
-                        // forget about the temp. liveGen
                         _nextGen = false;
                         _liveGen -= 1;
                     }
@@ -196,9 +183,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
-            // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
-            Monitor.Exit(_wlocko);
+            if (lockInfo.Taken) Monitor.Exit(_wlocko);
         }
 
         private void Release(ReadLockInfo lockInfo)
@@ -212,9 +198,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _items.Count;
 
-        private LinkedNode<TValue> GetHead(TKey key)
+        private LinkedNode GetHead(TKey key)
         {
-            _items.TryGetValue(key, out var link); // else null
+            _items.TryGetValue(key, out LinkedNode link); // else null
             return link;
         }
 
@@ -235,7 +221,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         // for an older gen - if value is different then insert a new
                         // link for the new gen, with the new value
                         if (link.Value != value)
-                            _items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
+                            _items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
                     }
                     else
                     {
@@ -249,7 +235,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
                 else
                 {
-                    _items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
+                    _items.TryAdd(key, new LinkedNode(value, _liveGen));
                 }
             }
             finally
@@ -275,7 +261,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (kvp.Value.Gen < _liveGen)
                     {
-                        var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
+                        var link = new LinkedNode(null, _liveGen, kvp.Value);
                         _items.TryUpdate(kvp.Key, link, kvp.Value);
                     }
                     else
@@ -351,12 +337,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 Lock(lockInfo);
 
-                // if no next generation is required, and we already have a gen object,
-                // use it to create a new snapshot
-                if (_nextGen == false && _genObj != null)
-                    return new Snapshot(this, _genObj.GetGenRef());
+                // if no next generation is required, and we already have one,
+                // use it and create a new snapshot
+                if (_nextGen == false && _generationObject != null)
+                    return new Snapshot(this, _generationObject.GetReference());
 
-                // else we need to try to create a new gen object
+                // else we need to try to create a new gen ref
                 // whether we are wlocked or not, noone can rlock while we do,
                 // so _liveGen and _nextGen are safe
                 if (_wlocked > 0) // volatile, cannot ++ but could --
@@ -364,32 +350,29 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // write-locked, cannot use latest gen (at least 1) so use previous
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
-                    // create a new gen object if we don't already have one
-                    // (happens the first time a snapshot is created)
-                    if (_genObj == null)
-                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
-
-                    // if we have one already, ensure it's consistent
-                    else if (_genObj.Gen != snapGen)
+                    // create a new gen ref unless we already have it
+                    if (_generationObject == null)
+                        _generationObjects.Enqueue(_generationObject = new GenerationObject(snapGen));
+                    else if (_generationObject.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
-                    // not write-locked, can use latest gen (_liveGen), create a corresponding new gen object
-                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                    // not write-locked, can use latest gen, create a new gen ref
+                    _generationObjects.Enqueue(_generationObject = new GenerationObject(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
                 // so...
-                // the genObj has a weak ref to the genRef, and is queued
-                // the snapshot has a ref to the genRef, which has a ref to the genObj
-                // when the snapshot is disposed, it decreases genObj counter
+                // the genRefRef has a weak ref to the genRef, and is queued
+                // the snapshot has a ref to the genRef, which has a ref to the genRefRef
+                // when the snapshot is disposed, it decreases genRefRef counter
                 // so after a while, one of these conditions is going to be true:
-                // - genObj.Count is zero because all snapshots have properly been disposed
-                // - genObj.WeakGenRef is dead because all snapshots have been collected
+                // - the genRefRef counter is zero because all snapshots have properly been disposed
+                // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genObj.GetGenRef());
+                var snapshot = new Snapshot(this, _generationObject.GetReference());
 
                 // reading _floorGen is safe if _collectTask is null
                 if (_collectTask == null && _collectAuto && _liveGen - _floorGen > CollectMinGenDelta)
@@ -433,16 +416,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void Collect()
         {
             // see notes in CreateSnapshot
-            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
+            while (_generationObjects.TryPeek(out GenerationObject generationObject) && (generationObject.Count == 0 || generationObject.WeakReference.IsAlive == false))
             {
-                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
-                _floorGen = genObj.Gen;
+                _generationObjects.TryDequeue(out generationObject); // cannot fail since TryPeek has succeeded
+                _floorGen = generationObject.Gen;
             }
 
             Collect(_items);
         }
 
-        private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
+        private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
         {
             // it is OK to enumerate a concurrent dictionary and it does not lock
             // it - and here it's not an issue if we skip some items, they will be
@@ -477,7 +460,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // not live, null value, no next link = remove that one -- but only if
                     // the dict has not been updated, have to do it via ICollection<> (thanks
                     // Mr Toub) -- and if the dict has been updated there is nothing to collect
-                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
+                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
                     /*var removed =*/ idict.Remove(kvp);
                     //Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
                     continue;
@@ -502,14 +485,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 task = _collectTask;
             }
-            return task ?? Task.CompletedTask;
+            return task ?? Task.FromResult(0);
             //if (task != null)
             //    await task;
         }
 
-        public long GenCount => _genObjs.Count;
+        public long GenCount => _generationObjects.Count;
 
-        public long SnapCount => _genObjs.Sum(x => x.Count);
+        public long SnapCount => _generationObjects.Sum(x => x.Count);
 
         #endregion
 
@@ -530,7 +513,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             public long LiveGen => _dict._liveGen;
             public long FloorGen => _dict._floorGen;
             public bool NextGen => _dict._nextGen;
-            public int WLocked => _dict._wlocked;
 
             public bool CollectAuto
             {
@@ -538,15 +520,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
-            public GenObj GenObj => _dict._genObj;
-
-            public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
+            public ConcurrentQueue<GenerationObject> GenerationObjects => _dict._generationObjects;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);
 
             public GenVal[] GetValues(TKey key)
             {
-                _dict._items.TryGetValue(key, out var link); // else null
+                _dict._items.TryGetValue(key, out LinkedNode link); // else null
 
                 if (link == null)
                     return new GenVal[0];
@@ -579,23 +559,35 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
+        private class LinkedNode
+        {
+            public LinkedNode(TValue value, long gen, LinkedNode next = null)
+            {
+                Value = value;
+                Gen = gen;
+                Next = next;
+            }
+
+            internal readonly long Gen;
+
+            // reading & writing references is thread-safe on all .NET platforms
+            // mark as volatile to ensure we always read the correct value
+            internal volatile TValue Value;
+            internal volatile LinkedNode Next;
+        }
+
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
-            private readonly GenRef _genRef;
-            private readonly long _gen; // copied for perfs
-            private int _disposed;
+            private readonly GenerationReference _generationReference;
+            private long _gen; // copied for perfs
 
-            //private static int _count;
-            //private readonly int _thisCount;
-
-            internal Snapshot(SnapDictionary<TKey, TValue> store, GenRef genRef)
+            internal Snapshot(SnapDictionary<TKey, TValue> store, GenerationReference generationReference)
             {
                 _store = store;
-                _genRef = genRef;
-                _gen = genRef.GenObj.Gen;
-                _genRef.GenObj.Reference();
-                //_thisCount = _count++;
+                _generationReference = generationReference;
+                _gen = generationReference.GenerationObject.Gen;
+                _generationReference.GenerationObject.Reference();
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -604,21 +596,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _gen = gen;
             }
 
-            private void EnsureNotDisposed()
-            {
-                if (_disposed > 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
-            }
-
             public TValue Get(TKey key)
             {
-                EnsureNotDisposed();
+                if (_gen < 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                 return _store.Get(key, _gen);
             }
 
             public IEnumerable<TValue> GetAll()
             {
-                EnsureNotDisposed();
+                if (_gen < 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                 return _store.GetAll(_gen);
             }
 
@@ -626,7 +614,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    EnsureNotDisposed();
+                    if (_gen < 0)
+                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                     return _store.IsEmpty(_gen);
                 }
             }
@@ -635,20 +624,63 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    EnsureNotDisposed();
+                    if (_gen < 0)
+                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                     return _gen;
                 }
             }
 
             public void Dispose()
             {
-                if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
-                    return;
-                _genRef?.GenObj.Release();
+                if (_gen < 0) return;
+                _gen = -1;
+                _generationReference?.GenerationObject.Release();
                 GC.SuppressFinalize(this);
             }
         }
 
+        internal class GenerationObject
+        {
+            public GenerationObject(long gen)
+            {
+                Gen = gen;
+                WeakReference = new WeakReference(null);
+            }
+
+            public GenerationReference GetReference()
+            {
+                // not thread-safe but always invoked from within a lock
+                var generationReference = (GenerationReference) WeakReference.Target;
+                if (generationReference == null)
+                    WeakReference.Target = generationReference = new GenerationReference(this);
+                return generationReference;
+            }
+
+            public readonly long Gen;
+            public readonly WeakReference WeakReference;
+            public int Count;
+
+            public void Reference()
+            {
+                Interlocked.Increment(ref Count);
+            }
+
+            public void Release()
+            {
+                Interlocked.Decrement(ref Count);
+            }
+        }
+
+        internal class GenerationReference
+        {
+            public GenerationReference(GenerationObject generationObject)
+            {
+                GenerationObject = generationObject;
+            }
+
+            public readonly GenerationObject GenerationObject;
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c6cbc7cbaa..09cc7d856a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -205,9 +205,6 @@
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />

From b4885f48d77aa160fc19166386678ea075ede043 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Apr 2019 14:31:34 +1100
Subject: [PATCH 128/130] fixing bad merge problem

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec  | 2 +-
 build/NuSpecs/UmbracoCms.nuspec      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index b257f8dcdd..11b1870b90 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 79113a7c94..e81c199288 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 8ec1484452..c93a82c691 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>

From 76e2f2f38013cd3a5f2fe65315ab925afee9c494 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Apr 2019 09:15:30 +0200
Subject: [PATCH 129/130] #4011 - Not using a unnecessary function call in
 views

---
 .../src/views/propertyeditors/grid/editors/embed.controller.js | 3 ---
 .../src/views/propertyeditors/grid/editors/embed.html          | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index 8e9ea06a84..a45e569897 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -17,9 +17,6 @@ angular.module("umbraco")
             
             $scope.embedHtml = getEmbed();
         }, false);
-    	$scope.hasEmbed = function() {
-            return $scope.control.value !== null;
-        }
     	$scope.setEmbed = function() {
             var embed = {
                 submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 0178c3b3ec..8cfa71f082 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="hasEmbed() === false">
+	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
 		<i class="icon icon-movie-alt"></i>
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>

From a9f5d3c1e8e9e0c9ec460181d6f0153762526ae7 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Apr 2019 09:41:29 +0200
Subject: [PATCH 130/130] #4011 - Use discreet word not disgrete

---
 .../src/less/components/umb-grid.less         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 5a14294ebf..b5abbe06bc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -165,13 +165,13 @@
     min-height: 88px;
     border-width: 1px;
     border-style: dashed;
-    border-color: @ui-action-disgrete-border;
-    color: @ui-action-disgrete-type;
+    border-color: @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
     transition: border-color 100ms linear;
 
     &:hover {
-        border-color: @ui-action-disgrete-border-hover;
-        color: @ui-action-disgrete-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        color: @ui-action-discreet-type-hover;
         cursor: pointer;
     }
 }
@@ -209,9 +209,9 @@
 }
 
 .umb-grid .cell-tools-add {
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
     &:focus, &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         text-decoration: none;
     }
 }
@@ -221,17 +221,17 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 }
 
 .umb-grid .cell-tools-add.-bar {
     display: block;
     text-align: center;
     padding: 5px;
-    border: 1px dashed @ui-action-disgrete-border;
+    border: 1px dashed @ui-action-discreet-border;
     margin: 10px;
     &:focus, &:hover {
-        border-color: @ui-action-disgrete-border-hover;
+        border-color: @ui-action-discreet-border-hover;
     }
 }
 
@@ -542,13 +542,13 @@
     display: inline-block;
     cursor: pointer;
     border-radius: 200px;
-    border: 1px solid @ui-action-disgrete-border;
+    border: 1px solid @ui-action-discreet-border;
     margin: 2px;
 
     &:hover, &:hover * {
-        background: @ui-action-disgrete-type-hover !important;
+        background: @ui-action-discreet-type-hover !important;
         color: @white !important;
-        border-color: @ui-action-disgrete-border-hover !important;
+        border-color: @ui-action-discreet-border-hover !important;
         text-decoration: none;
     }
 }