From f1197a6db2bf1d667c02802bdb41e70634d12e0b Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Thu, 27 Dec 2018 13:23:20 +0100
Subject: [PATCH 01/84] Adding shortcuts for closing an infinite editor through
 Escape key.

---
 .../common/infiniteeditors/compositions/compositions.html      | 1 +
 .../src/views/common/infiniteeditors/copy/copy.html            | 1 +
 .../common/infiniteeditors/datatypepicker/datatypepicker.html  | 3 ++-
 .../infiniteeditors/datatypesettings/datatypesettings.html     | 3 ++-
 .../src/views/common/infiniteeditors/embed/embed.html          | 1 +
 .../views/common/infiniteeditors/iconpicker/iconpicker.html    | 3 ++-
 .../infiniteeditors/insertcodesnippet/insertcodesnippet.html   | 1 +
 .../views/common/infiniteeditors/insertfield/insertfield.html  | 1 +
 .../views/common/infiniteeditors/itempicker/itempicker.html    | 1 +
 .../views/common/infiniteeditors/linkpicker/linkpicker.html    | 1 +
 .../infiniteeditors/membergrouppicker/membergrouppicker.html   | 1 +
 .../src/views/common/infiniteeditors/move/move.html            | 1 +
 .../infiniteeditors/nodepermissions/nodepermissions.html       | 1 +
 .../infiniteeditors/propertysettings/propertysettings.html     | 1 +
 .../common/infiniteeditors/querybuilder/querybuilder.html      | 3 ++-
 .../src/views/common/infiniteeditors/rollback/rollback.html    | 3 ++-
 .../common/infiniteeditors/sectionpicker/sectionpicker.html    | 3 ++-
 .../infiniteeditors/templatesections/templatesections.html     | 1 +
 .../views/common/infiniteeditors/treepicker/treepicker.html    | 1 +
 .../infiniteeditors/usergrouppicker/usergrouppicker.html       | 3 ++-
 .../views/common/infiniteeditors/userpicker/userpicker.html    | 3 ++-
 .../stylesheets/infiniteeditors/richtextrule/richtextrule.html | 1 +
 22 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
index 84fbab7cb2..bf74431d96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -110,6 +110,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
index 18a35394ec..eea165c811 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
@@ -75,6 +75,7 @@
                         type="button"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         action="vm.close()">
                     </umb-button>
                     <umb-button
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 54e7a782fd..f3f991c63e 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
@@ -129,6 +129,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
             </umb-editor-footer-content-right>
@@ -138,4 +139,4 @@
 
     </umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
index b4ff894c4d..620f9f1731 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
@@ -52,6 +52,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
@@ -68,4 +69,4 @@
     </form>
 
 </umb-editor-view>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index f14fb364ab..e48ec84b25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -54,6 +54,7 @@
                         type="button"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         action="vm.close()">
                     </umb-button>
                     <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index c0ca65de9c..0630f9c68e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -68,6 +68,7 @@
                 type="button"
                 button-style="link"
                 label-key="general_close"
+                shortcut="esc"
                 action="vm.close()">
             </umb-button>
         </umb-editor-footer-content-right>
@@ -75,4 +76,4 @@
 
 </umb-editor-view>
 
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
index 2ccbf11cc1..ea247c77e5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
@@ -47,6 +47,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
             </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
index 56bd498fd1..16f4bfb919 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
@@ -207,6 +207,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
index 9963807772..80d4baff6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
@@ -44,6 +44,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
             </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index a50ab4242d..71fcf2f493 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -120,6 +120,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html
index 13af3e4108..7240ec8f06 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html
@@ -32,6 +32,7 @@
 						type="button"
 						button-style="link"
 						label-key="general_close"
+					    shortcut="esc"
 						action="vm.close()">
 					</umb-button>
 					<umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
index 03d7e84342..8424bcefbe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
@@ -67,6 +67,7 @@
                 type="button"
                 button-style="link"
                 label-key="general_close"
+                shortcut="esc"
                 action="vm.close()">
             </umb-button>
             <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html
index d41fc862b7..1846e3caa2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html
@@ -37,6 +37,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index df5bbe8ca5..4c7f2613b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -155,6 +155,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index 4b6c6cc179..725871337d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -193,6 +193,7 @@
 					type="button"
 					button-style="link"
 					label-key="general_close"
+				    shortcut="esc"
 					action="vm.close()">
 				</umb-button>
 
@@ -209,4 +210,4 @@
 
 	</umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index b5b925b266..d7ba57c1af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -86,6 +86,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
@@ -101,4 +102,4 @@
 
     </umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 8ca1993dcc..2e88bf709c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -38,6 +38,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
@@ -51,4 +52,4 @@
 
     </umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
index d6e3996287..5b946976d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
@@ -87,6 +87,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index 7270676b1e..da81d48c78 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -90,6 +90,7 @@
                         type="button"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         action="vm.close()">
                     </umb-button>
     
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
index e97d80648b..e2ae1ab524 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
@@ -84,6 +84,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
@@ -97,4 +98,4 @@
 
     </umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
index bc6c8b5761..e39d693b47 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
@@ -74,6 +74,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
                 <umb-button
@@ -87,4 +88,4 @@
 
     </umb-editor-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
index a36f3ef6a2..557341fe1b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
@@ -53,6 +53,7 @@
                         type="button"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         action="vm.close()">
                     </umb-button>
                     <umb-button

From 0852b20b311cbeb4efa6360c5e1e17720c4d7b16 Mon Sep 17 00:00:00 2001
From: Floris Robbemont <florisrobbemont@users.noreply.github.com>
Date: Thu, 3 Jan 2019 16:38:37 +0100
Subject: [PATCH 02/84] Fix for wrong sorting overload in MediaService (#3948)

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

diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index d1f11c619a..b95a8a258c 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -509,7 +509,7 @@ namespace Umbraco.Core.Services
         public IEnumerable<IMedia> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
             string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
         {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter, null);
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter, null);
         }
 
         /// <summary>

From cc6c16894c288f422140482f55bd773e01df08f8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 6 Jan 2019 19:11:58 +0100
Subject: [PATCH 03/84] Safeguard the tags value converter against empty tags

---
 .../ValueConverters/TagsValueConverter.cs              | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
index b085748487..204fde0c2e 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
@@ -42,16 +42,22 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
+            var sourceAsString = source?.ToString();
+            if(sourceAsString.IsNullOrWhiteSpace())
+            {
+                return new string[0];
+            }
+
             // if Json storage type deserialzie and return as string array
             if (JsonStorageType(propertyType.DataTypeId))
             {
-                var jArray = JsonConvert.DeserializeObject<JArray>(source.ToString());
+                var jArray = JsonConvert.DeserializeObject<JArray>(sourceAsString);
                 return jArray.ToObject<string[]>();
             }
 
             // Otherwise assume CSV storage type and return as string array
             var csvTags =
-                source.ToString()
+                sourceAsString
                     .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
                     .ToArray();
             return csvTags;

From 4564623899fb265f5dc1cb62ddbf7d43a169e4e1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 3 Jan 2019 21:04:59 +0100
Subject: [PATCH 04/84] Don't use a hardcoded folder type alias to determine
 folder types in the list view

---
 .../views/propertyeditors/listview/listview.controller.js   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 118f1b81d2..df7a574c49 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -1,4 +1,4 @@
-function listViewController($rootScope, $scope, $routeParams, $injector, $cookieStore, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState, $timeout, $q, mediaResource, listViewHelper, userService, navigationService, treeService) {
+function listViewController($rootScope, $scope, $routeParams, $injector, $cookieStore, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState, $timeout, $q, mediaResource, listViewHelper, userService, navigationService, treeService, mediaHelper) {
 
    //this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content
    // that isn't created yet, if we continue this will use the parent id in the route params which isn't what
@@ -269,10 +269,12 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
          $scope.listViewResultSet = data;
 
          //update all values for display
+         var section = appState.getSectionState("currentSection");
          if ($scope.listViewResultSet.items) {
             _.each($scope.listViewResultSet.items, function (e, index) {
                setPropertyValues(e);
-               if (e.contentTypeAlias === 'Folder') {
+               // create the folders collection (only for media list views)
+               if (section === "media" && !mediaHelper.hasFilePropertyType(e)) {
                    $scope.folders.push(e);
                }
             });

From d53d0b4271110d49dfc5bcaadff1c68ef6506385 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 7 Jan 2019 12:53:31 +0100
Subject: [PATCH 05/84] Add disabled state to toggle (#3967)

(cherry picked from commit d231db8ef25455c2d1f291b9b707e4d95a251a9f)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/languages/edit.html
---
 .../components/buttons/umbtoggle.directive.js          |  4 ++++
 .../src/less/components/buttons/umb-toggle.less        | 10 ++++++++--
 .../src/less/components/users/umb-permission.less      |  6 ++++++
 .../src/views/components/buttons/umb-toggle.html       |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
index e3c4cbf40c..c2c9ec068b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
@@ -18,6 +18,7 @@
 
         <umb-toggle
             checked="vm.checked"
+            disabled="vm.disabled"
             on-click="vm.toggle()"
             show-labels="true"
             label-on="Start"
@@ -38,6 +39,7 @@
 
             var vm = this;
             vm.checked = false;
+            vm.disabled = false;
 
             vm.toggle = toggle;
 
@@ -52,6 +54,7 @@
 </pre>
 
 @param {boolean} checked Set to <code>true</code> or <code>false</code> to toggle the switch.
+@param {boolean} disabled Set to <code>true</code> or <code>false</code> to disable the switch.
 @param {callback} onClick The function which should be called when the toggle is clicked.
 @param {string=} showLabels Set to <code>true</code> or <code>false</code> to show a "On" or "Off" label next to the switch.
 @param {string=} labelOn Set a custom label for when the switched is turned on. It will default to "On".
@@ -115,6 +118,7 @@
             templateUrl: 'views/components/buttons/umb-toggle.html',
             scope: {
                 checked: "=",
+                disabled: "=",
                 onClick: "&",
                 labelOn: "@?",
                 labelOff: "@?",
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
index 150963cbb2..4c30ae583c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
@@ -28,7 +28,8 @@
 
 .umb-toggle__toggle {
     cursor: pointer;
-    display: inline-block;
+    align-items: center;
+    display: flex;
     width: 48px;
     height: 24px;
     background: @gray-8;
@@ -41,6 +42,11 @@
     background-color: @green;
 }
 
+.umb-toggle--disabled .umb-toggle__toggle {
+    cursor: not-allowed;
+    opacity: 0.8;
+}
+
 .umb-toggle--checked .umb-toggle__handler {
     transform: translate3d(24px, 0, 0) rotate(0);
 }
@@ -63,7 +69,7 @@
 
 .umb-toggle__icon {
     position: absolute;
-    top: 3px;
+    line-height: 1em;
     text-decoration: none;
     transition: all 0.2s ease;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
index 9447a48217..5855fbd528 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
@@ -21,6 +21,12 @@
     cursor: pointer;
 }
 
+.umb-permission--disabled .umb-permission__toggle,
+.umb-permission--disabled .umb-permission__content {
+    cursor: not-allowed;
+    opacity: 0.8;
+}
+
 .umb-permission__description {
     font-size: 13px;
     color: @gray-5;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
index bc5c114bb6..c8039448fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
@@ -1,4 +1,4 @@
-<button ng-click="click()" type="button" class="umb-toggle" ng-class="{'umb-toggle--checked': checked}">
+<button ng-click="click()" type="button" class="umb-toggle" ng-disabled="disabled" ng-class="{'umb-toggle--checked': checked, 'umb-toggle--disabled': disabled}">
 
     <span ng-if="!labelPosition && showLabels === 'true' || labelPosition === 'left' && showLabels === 'true'">
         <span ng-if="!checked" class="umb-toggle__label umb-toggle__label--left">{{ displayLabelOff }}</span>

From 21612454d07f0f491ff8e47d0a46583794209e61 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 7 Jan 2019 13:45:43 +0100
Subject: [PATCH 06/84] Update umbtoggle.directive.js

---
 .../common/directives/components/buttons/umbtoggle.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
index c2c9ec068b..9bc0a027e0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
@@ -54,7 +54,7 @@
 </pre>
 
 @param {boolean} checked Set to <code>true</code> or <code>false</code> to toggle the switch.
-@param {boolean} disabled Set to <code>true</code> or <code>false</code> to disable the switch.
+@param {boolean} disabled Set to <code>true</code> or <code>false</code> to disable/enable the switch.
 @param {callback} onClick The function which should be called when the toggle is clicked.
 @param {string=} showLabels Set to <code>true</code> or <code>false</code> to show a "On" or "Off" label next to the switch.
 @param {string=} labelOn Set a custom label for when the switched is turned on. It will default to "On".

From f7c70bde1e11a5744bb5c8c9ca36aef50c0f0282 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 7 Jan 2019 23:49:29 +1100
Subject: [PATCH 07/84] Fixing up the PublishedContentQuery.Search
 implementation 3920

---
 src/Umbraco.Examine/ContentValueSetBuilder.cs |  6 +-
 .../ContentValueSetValidator.cs               |  2 +-
 src/Umbraco.Examine/MediaValueSetBuilder.cs   |  2 +-
 src/Umbraco.Examine/MemberValueSetBuilder.cs  |  2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj    |  2 +-
 .../UmbracoFieldDefinitionCollection.cs       |  6 +-
 src/Umbraco.Examine/UmbracoMemberIndex.cs     | 31 +------
 .../PublishedContentMoreTests.cs              |  2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +-
 .../UmbracoContentValueSetValidatorTests.cs   |  6 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 src/Umbraco.Web/ExamineExtensions.cs          |  3 +-
 src/Umbraco.Web/PublishedContentQuery.cs      | 84 ++++++++++++++++++-
 .../Routing/ContentFinderByLegacy404.cs       |  2 +-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  6 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 src/Umbraco.Web/UmbracoHelper.cs              |  2 +-
 17 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index 07e5e4565b..18cd5e311f 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Examine
                     {"icon", c.ContentType.Icon.Yield()},
                     {UmbracoExamineIndex.PublishedFieldName, new object[] {c.Published ? 1 : 0}},   //Always add invariant published value
                     {"id", new object[] {c.Id}},
-                    {"key", new object[] {c.Key}},
+                    {UmbracoExamineIndex.NodeKeyFieldName, new object[] {c.Key}},
                     {"parentID", new object[] {c.Level > 1 ? c.ParentId : -1}},
                     {"level", new object[] {c.Level}},
                     {"creatorID", new object[] {c.CreatorId}},
@@ -61,12 +61,12 @@ namespace Umbraco.Examine
                     {"writerName",(c.GetWriterProfile(_userService)?.Name ?? "??").Yield() },
                     {"writerID", new object[] {c.WriterId}},
                     {"template", new object[] {c.Template?.Id ?? 0}},
-                    {UmbracoContentIndex.VariesByCultureFieldName, new object[] {0}},
+                    {UmbracoContentIndex.VariesByCultureFieldName, new object[] {"n"}},
                 };
 
                 if (isVariant)
                 {
-                    values[UmbracoContentIndex.VariesByCultureFieldName] = new object[] { 1 };
+                    values[UmbracoContentIndex.VariesByCultureFieldName] = new object[] { "y" };
 
                     foreach (var culture in c.AvailableCultures)
                     {
diff --git a/src/Umbraco.Examine/ContentValueSetValidator.cs b/src/Umbraco.Examine/ContentValueSetValidator.cs
index d4f6ceb15f..bcceafc272 100644
--- a/src/Umbraco.Examine/ContentValueSetValidator.cs
+++ b/src/Umbraco.Examine/ContentValueSetValidator.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Examine
 
                 //deal with variants, if there are unpublished variants than we need to remove them from the value set
                 if (valueSet.Values.TryGetValue(UmbracoContentIndex.VariesByCultureFieldName, out var variesByCulture)
-                    && variesByCulture.Count > 0 && variesByCulture[0].Equals(1))
+                    && variesByCulture.Count > 0 && variesByCulture[0].Equals("y"))
                 {
                     //so this valueset is for a content that varies by culture, now check for non-published cultures and remove those values
                     foreach(var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
diff --git a/src/Umbraco.Examine/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
index f0e5e895e6..2676093eeb 100644
--- a/src/Umbraco.Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MediaValueSetBuilder.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Examine
                 {
                     {"icon", m.ContentType.Icon.Yield()},
                     {"id", new object[] {m.Id}},
-                    {"key", new object[] {m.Key}},
+                    {UmbracoExamineIndex.NodeKeyFieldName, new object[] {m.Key}},
                     {"parentID", new object[] {m.Level > 1 ? m.ParentId : -1}},
                     {"level", new object[] {m.Level}},
                     {"creatorID", new object[] {m.CreatorId}},
diff --git a/src/Umbraco.Examine/MemberValueSetBuilder.cs b/src/Umbraco.Examine/MemberValueSetBuilder.cs
index 9864aba18d..d9f0b7806d 100644
--- a/src/Umbraco.Examine/MemberValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MemberValueSetBuilder.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Examine
                 {
                     {"icon", m.ContentType.Icon.Yield()},
                     {"id", new object[] {m.Id}},
-                    {"key", new object[] {m.Key}},
+                    {UmbracoExamineIndex.NodeKeyFieldName, new object[] {m.Key}},
                     {"parentID", new object[] {m.Level > 1 ? m.ParentId : -1}},
                     {"level", new object[] {m.Level}},
                     {"creatorID", new object[] {m.CreatorId}},
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index a68131da0d..6864329bff 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta072" />
+    <PackageReference Include="Examine" Version="1.0.0-beta075" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
index 97d1f68727..43c9553400 100644
--- a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Examine
             new FieldDefinition("createDate", FieldDefinitionTypes.DateTime),
             new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime),
 
-            new FieldDefinition("key", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+            new FieldDefinition(UmbracoExamineIndex.NodeKeyFieldName, FieldDefinitionTypes.InvariantCultureIgnoreCase),
             new FieldDefinition("version", FieldDefinitionTypes.Raw),
             new FieldDefinition("nodeType", FieldDefinitionTypes.InvariantCultureIgnoreCase),
             new FieldDefinition("template", FieldDefinitionTypes.Raw),
@@ -40,9 +40,9 @@ namespace Umbraco.Examine
             new FieldDefinition("email", FieldDefinitionTypes.EmailAddress),
 
             new FieldDefinition(UmbracoExamineIndex.PublishedFieldName, FieldDefinitionTypes.Raw),
-            new FieldDefinition(UmbracoExamineIndex.NodeKeyFieldName, FieldDefinitionTypes.Raw),
             new FieldDefinition(UmbracoExamineIndex.IndexPathFieldName, FieldDefinitionTypes.Raw),
-            new FieldDefinition(UmbracoExamineIndex.IconFieldName, FieldDefinitionTypes.Raw)
+            new FieldDefinition(UmbracoExamineIndex.IconFieldName, FieldDefinitionTypes.Raw),
+            new FieldDefinition(UmbracoContentIndex.VariesByCultureFieldName, FieldDefinitionTypes.Raw),
         };
 
         ///// <summary>
diff --git a/src/Umbraco.Examine/UmbracoMemberIndex.cs b/src/Umbraco.Examine/UmbracoMemberIndex.cs
index 9782f94fe4..fbf8a1cc0f 100644
--- a/src/Umbraco.Examine/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine/UmbracoMemberIndex.cs
@@ -32,35 +32,6 @@ namespace Umbraco.Examine
             base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, validator)
         {
         }
-
-        /// <summary>
-        /// Overridden to ensure that the umbraco system field definitions are in place
-        /// </summary>
-        /// <param name="indexValueTypesFactory"></param>
-        /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypesFactory = null)
-        {
-            var keyDef = new FieldDefinition("__key", FieldDefinitionTypes.Raw);
-            FieldDefinitionCollection.TryAdd(keyDef);
-
-            return base.CreateFieldValueTypes(indexValueTypesFactory);
-        }
-
-        /// <summary>
-        /// Ensure some custom values are added to the index
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnTransformingIndexValues(IndexingItemEventArgs e)
-        {
-            base.OnTransformingIndexValues(e);
-
-            if (e.ValueSet.Values.TryGetValue("key", out var key) && e.ValueSet.Values.ContainsKey("__key") == false)
-            {
-                //double __ prefix means it will be indexed as culture invariant
-                e.ValueSet.Values["__key"] = key;
-            }
-
-        }
-
+        
     }
 }
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index c5b8e21870..5f3a51f4f6 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -195,7 +195,7 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void PublishedContentQueryTypedContentList()
         {
-            var query = new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache);
+            var query = new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache, UmbracoContext.Current.VariationContextAccessor);
             var result = query.Content(new[] { 1, 2, 4 }).ToArray();
             Assert.AreEqual(2, result.Length);
             Assert.AreEqual(1, result[0].Id);
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index bed1281bf8..8eb6d086a1 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta072" />
+    <PackageReference Include="Examine" Version="1.0.0-beta075" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.9</Version>
     </PackageReference>
diff --git a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
index 8d7a446ccb..08db6b35e0 100644
--- a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
@@ -237,7 +237,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoContentIndex.VariesByCultureFieldName] = 1,
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y",
                     [UmbracoExamineIndex.PublishedFieldName] = 0
                 }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -247,7 +247,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoContentIndex.VariesByCultureFieldName] = 1,
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y",
                     [UmbracoExamineIndex.PublishedFieldName] = 1
                 }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
@@ -257,7 +257,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoContentIndex.VariesByCultureFieldName] = 1,
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y",
                     [$"{UmbracoExamineIndex.PublishedFieldName}_en-us"] = 1,
                     ["hello_en-us"] = "world",
                     ["title_en-us"] = "my title",
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2fc199d06a..dae0781926 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta072" />
+    <PackageReference Include="Examine" Version="1.0.0-beta075" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/ExamineExtensions.cs b/src/Umbraco.Web/ExamineExtensions.cs
index f1ed6c0659..9a9fa98d95 100644
--- a/src/Umbraco.Web/ExamineExtensions.cs
+++ b/src/Umbraco.Web/ExamineExtensions.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Examine;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 3d8f36ec1a..03a0e8dfb2 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -24,16 +25,19 @@ namespace Umbraco.Web
     {
         private readonly IPublishedContentCache _contentCache;
         private readonly IPublishedMediaCache _mediaCache;
+        private readonly IVariationContextAccessor _variationContextAccessor;
 
         /// <summary>
         /// Constructor used to return results from the caches
         /// </summary>
         /// <param name="contentCache"></param>
         /// <param name="mediaCache"></param>
-        public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache)
+        /// <param name="variationContextAccessor"></param>
+        public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache, IVariationContextAccessor variationContextAccessor)
         {
             _contentCache = contentCache ?? throw new ArgumentNullException(nameof(contentCache));
             _mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
+            _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
         }
 
         #region Content
@@ -201,6 +205,9 @@ namespace Umbraco.Web
             // default to max 500 results
             var count = skip == 0 && take == 0 ? 500 : skip + take;
 
+            //set this to the specific culture or to the culture in the request
+            culture = culture ?? _variationContextAccessor.VariationContext.Culture;
+
             ISearchResults results;
             if (culture.IsNullOrWhiteSpace())
             {
@@ -211,7 +218,7 @@ namespace Umbraco.Web
                 //get all index fields suffixed with the culture name supplied
                 var cultureFields = new List<string>();
                 var fields = umbIndex.GetFields();
-                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, 1); //must vary by culture
+                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
                 // ReSharper disable once LoopCanBeConvertedToQuery
                 foreach (var field in fields)
                 {
@@ -225,7 +232,8 @@ namespace Umbraco.Web
             }
 
             totalRecords = results.TotalItemCount;
-            return results.ToPublishedSearchResults(_contentCache);
+
+            return new CultureContextualSearchResults(results.ToPublishedSearchResults(_contentCache), _variationContextAccessor, culture);
         }
 
         /// <inheritdoc />
@@ -245,6 +253,76 @@ namespace Umbraco.Web
             return results.ToPublishedSearchResults(_contentCache);
         }
 
+        /// <summary>
+        /// This is used to contextualize the values in the search results when enumerating over them so that the correct culture values are used
+        /// </summary>
+        private class CultureContextualSearchResults : IEnumerable<PublishedSearchResult>
+        {
+            private readonly IEnumerable<PublishedSearchResult> _wrapped;
+            private readonly IVariationContextAccessor _variationContextAccessor;
+            private readonly string _culture;
+
+            public CultureContextualSearchResults(IEnumerable<PublishedSearchResult> wrapped, IVariationContextAccessor variationContextAccessor, string culture)
+            {
+                _wrapped = wrapped;
+                _variationContextAccessor = variationContextAccessor;
+                _culture = culture;
+            }
+
+            public IEnumerator<PublishedSearchResult> GetEnumerator()
+            {
+                //We need to change the current culture to what is requested and then change it back
+                var originalContext = _variationContextAccessor.VariationContext;
+                if (!_culture.IsNullOrWhiteSpace() && !_culture.InvariantEquals(originalContext.Culture))
+                    _variationContextAccessor.VariationContext = new VariationContext(_culture);
+
+                //now the IPublishedContent returned will be contextualized to the culture specified and will be reset when the enumerator is disposed
+                return new CultureContextualSearchResultsEnumerator(_wrapped.GetEnumerator(), _variationContextAccessor, originalContext);
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            /// <summary>
+            /// Resets the variation context when this is disposed
+            /// </summary>
+            private class CultureContextualSearchResultsEnumerator : IEnumerator<PublishedSearchResult>
+            {
+                private readonly IEnumerator<PublishedSearchResult> _wrapped;
+                private readonly IVariationContextAccessor _variationContextAccessor;
+                private readonly VariationContext _originalContext;
+
+                public CultureContextualSearchResultsEnumerator(IEnumerator<PublishedSearchResult> wrapped, IVariationContextAccessor variationContextAccessor, VariationContext originalContext)
+                {
+                    _wrapped = wrapped;
+                    _variationContextAccessor = variationContextAccessor;
+                    _originalContext = originalContext;
+                }
+
+                public void Dispose()
+                {
+                    _wrapped.Dispose();
+                    //reset
+                    _variationContextAccessor.VariationContext = _originalContext;
+                }
+
+                public bool MoveNext()
+                {
+                    return _wrapped.MoveNext();
+                }
+
+                public void Reset()
+                {
+                    _wrapped.Reset();
+                }
+
+                public PublishedSearchResult Current => _wrapped.Current;
+                object IEnumerator.Current => Current;
+            }
+        }
+
         /// <summary>
         /// Matches a culture iso name suffix
         /// </summary>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
index 99b4e22b5a..1f01270bc6 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Routing
             var error404 = NotFoundHandlerHelper.GetCurrentNotFoundPageId(
                 _contentConfigSection.Error404Collection.ToArray(),
                 _entityService,
-                new PublishedContentQuery(frequest.UmbracoContext.ContentCache, frequest.UmbracoContext.MediaCache),
+                new PublishedContentQuery(frequest.UmbracoContext.ContentCache, frequest.UmbracoContext.MediaCache, frequest.UmbracoContext.VariationContextAccessor),
                 errorCulture);
 
             IPublishedContent content = null;
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 47e73d383c..a60e5f1d1b 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -367,9 +367,9 @@ namespace Umbraco.Web.Search
                 {
                     m.AdditionalData["Email"] = result.Values["email"];
                 }
-                if (result.Values.ContainsKey("__key") && result.Values["__key"] != null)
+                if (result.Values.ContainsKey(UmbracoExamineIndex.NodeKeyFieldName) && result.Values[UmbracoExamineIndex.NodeKeyFieldName] != null)
                 {
-                    if (Guid.TryParse(result.Values["__key"], out var key))
+                    if (Guid.TryParse(result.Values[UmbracoExamineIndex.NodeKeyFieldName], out var key))
                     {
                         m.Key = key;
                     }
@@ -416,7 +416,7 @@ namespace Umbraco.Web.Search
                 if (intId.Success)
                 {
                     //if it varies by culture, return the default language URL
-                    if (result.Values.TryGetValue(UmbracoContentIndex.VariesByCultureFieldName, out var varies) && varies == "1")
+                    if (result.Values.TryGetValue(UmbracoContentIndex.VariesByCultureFieldName, out var varies) && varies == "y")
                     {
                         entity.AdditionalData["Url"] = _umbracoHelper.Url(intId.Result, defaultLang);
                     }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7a695ff4ef..83268bb78e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta072" />
+    <PackageReference Include="Examine" Version="1.0.0-beta075" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 6914efb3e2..f4be2a1700 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -106,7 +106,7 @@ namespace Umbraco.Web
         /// Gets the query context.
         /// </summary>
         public IPublishedContentQuery ContentQuery => _query ??
-            (_query = new PublishedContentQuery(UmbracoContext.ContentCache, UmbracoContext.MediaCache));
+            (_query = new PublishedContentQuery(UmbracoContext.ContentCache, UmbracoContext.MediaCache, UmbracoContext.VariationContextAccessor));
 
         /// <summary>
         /// Gets the Umbraco context.

From 4a1ae0573ffe1118233fa71527dc7be95004cfe9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 8 Jan 2019 13:25:07 +1100
Subject: [PATCH 08/84] Gets definitions dynamically applied for culture
 specific fields.

---
 src/Umbraco.Examine/ExamineExtensions.cs      | 33 +++++++++-
 src/Umbraco.Examine/Umbraco.Examine.csproj    |  2 +-
 .../UmbracoFieldDefinitionCollection.cs       | 60 ++++++++++++-------
 .../PublishedMediaCacheTests.cs               |  2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 src/Umbraco.Web/PublishedContentQuery.cs      | 19 +-----
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 8 files changed, 75 insertions(+), 47 deletions(-)

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 525f0deaa1..4fe6c359d7 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Examine;
 using Examine.LuceneEngine.Providers;
 using Lucene.Net.Analysis;
@@ -7,6 +9,7 @@ using Lucene.Net.Index;
 using Lucene.Net.QueryParsers;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
+using Umbraco.Core;
 using Version = Lucene.Net.Util.Version;
 using Umbraco.Core.Logging;
 
@@ -15,9 +18,35 @@ namespace Umbraco.Examine
     /// <summary>
     /// Extension methods for the LuceneIndex
     /// </summary>
-    internal static class ExamineExtensions
+    public static class ExamineExtensions
     {
-        public static bool TryParseLuceneQuery(string query)
+        /// <summary>
+        /// Matches a culture iso name suffix
+        /// </summary>
+        /// <remarks>
+        /// myFieldName_en-us will match the "en-us"
+        /// </remarks>
+        internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
+
+        /// <summary>
+        /// Returns all index fields that are culture specific (suffixed)
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static IEnumerable<string> GetCultureFields(this IUmbracoIndex index, string culture)
+        {
+            var allFields = index.GetFields();
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            foreach (var field in allFields)
+            {
+                var match = CultureIsoCodeFieldNameMatchExpression.Match(field);
+                if (match.Success && match.Groups.Count == 3 && culture.InvariantEquals(match.Groups[2].Value))
+                    yield return field;
+            }
+        }
+
+        internal static bool TryParseLuceneQuery(string query)
         {
             //TODO: I'd assume there would be a more strict way to parse the query but not that i can find yet, for now we'll
             // also do this rudimentary check
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 6864329bff..68df7b7ddd 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta075" />
+    <PackageReference Include="Examine" Version="1.0.0-beta076" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
index 43c9553400..8030eaecaf 100644
--- a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
@@ -1,4 +1,7 @@
-using Examine;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Examine;
+using Umbraco.Core;
 
 namespace Umbraco.Examine
 {
@@ -45,31 +48,42 @@ namespace Umbraco.Examine
             new FieldDefinition(UmbracoContentIndex.VariesByCultureFieldName, FieldDefinitionTypes.Raw),
         };
 
-        ///// <summary>
-        ///// Overridden to dynamically add field definitions for culture variations
-        ///// </summary>
-        ///// <param name="fieldName"></param>
-        ///// <param name="fieldDefinition"></param>
-        ///// <returns></returns>
-        //public override bool TryGetValue(string fieldName, out FieldDefinition fieldDefinition)
-        //{
-        //    var result = base.TryGetValue(fieldName, out fieldDefinition);
-        //    if (result) return true;
 
-        //    //if the fieldName is not suffixed with _iso-Code
-        //    var underscoreIndex = fieldName.LastIndexOf('_');
-        //    if (underscoreIndex == -1) return false;
+        /// <summary>
+        /// Overridden to dynamically add field definitions for culture variations
+        /// </summary>
+        /// <param name="fieldName"></param>
+        /// <param name="fieldDefinition"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// We need to do this so that we don't have to maintain a huge static list of all field names and their definitions
+        /// otherwise we'd have to dynamically add/remove definitions anytime languages are added/removed, etc...
+        /// For example, we have things like `nodeName` and `__Published` which are also used for culture fields like `nodeName_en-us`
+        /// and we don't want to have a full static list of all of these definitions when we can just define the one definition and then
+        /// dynamically apply that to culture specific fields.
+        /// </remarks>
+        public override bool TryGetValue(string fieldName, out FieldDefinition fieldDefinition)
+        {
+            if (base.TryGetValue(fieldName, out fieldDefinition))
+                return true;
 
+            //before we use regex to match do some faster simple matching since this is going to execute quite a lot
+            if (!fieldName.Contains("_"))
+                return false;
+            if (!fieldName.Contains("-"))
+                return false;
 
+            var match = ExamineExtensions.CultureIsoCodeFieldNameMatchExpression.Match(fieldName);
+            if (match.Success && match.Groups.Count == 3)
+            {
+                var nonCultureFieldName = match.Groups[1].Value;
+                //check if there's a definition for this and if so return the field definition for the culture field based on the non-culture field
+                if (base.TryGetValue(nonCultureFieldName, out fieldDefinition))
+                    return true;
+            }
+            return false;
+        }
 
-        //    var isoCode = fieldName.Substring(underscoreIndex);
-        //    if (isoCode.Length < 6) return false; //invalid isoCode
-
-        //    var hyphenIndex = isoCode.IndexOf('-');
-        //    if (hyphenIndex != 3) return false; //invalid isoCode
-
-        //    //we'll assume this is a valid isoCode
-
-        //}
+        
     }
 }
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index 5237b92ab8..d8a53bc829 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -201,7 +201,7 @@ namespace Umbraco.Tests.Cache.PublishedCache
                 {"creatorName", "Shannon"}
             };
 
-            var result = new SearchResult("1234", 1, 1, () => fields.ToDictionary(x => x.Key, x => new List<string> { x.Value }));
+            var result = new SearchResult("1234", 1, () => fields.ToDictionary(x => x.Key, x => new List<string> { x.Value }));
 
             var store = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new StaticCacheProvider(), ContentTypesCache);
             var doc = store.CreateFromCacheValues(store.ConvertFromSearchResult(result));
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8eb6d086a1..8a6ca29b2c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta075" />
+    <PackageReference Include="Examine" Version="1.0.0-beta076" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.9</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index dae0781926..f3324be30f 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta075" />
+    <PackageReference Include="Examine" Version="1.0.0-beta076" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 03a0e8dfb2..2c4d08502e 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -216,17 +216,8 @@ namespace Umbraco.Web
             else
             {
                 //get all index fields suffixed with the culture name supplied
-                var cultureFields = new List<string>();
-                var fields = umbIndex.GetFields();
+                var cultureFields = umbIndex.GetCultureFields(culture);
                 var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
-                // ReSharper disable once LoopCanBeConvertedToQuery
-                foreach (var field in fields)
-                {
-                    var match = CultureIsoCodeFieldName.Match(field);
-                    if (match.Success && match.Groups.Count == 2 && culture.InvariantEquals(match.Groups[1].Value))
-                        cultureFields.Add(field);
-                }
-
                 qry = qry.And().ManagedQuery(term, cultureFields.ToArray());
                 results = qry.Execute(count);
             }
@@ -323,13 +314,7 @@ namespace Umbraco.Web
             }
         }
 
-        /// <summary>
-        /// Matches a culture iso name suffix
-        /// </summary>
-        /// <remarks>
-        /// myFieldName_en-us will match the "en-us"
-        /// </remarks>
-        private static readonly Regex CultureIsoCodeFieldName = new Regex("^[_\\w]+_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
+        
 
 
         #endregion
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 83268bb78e..fd9822d172 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta075" />
+    <PackageReference Include="Examine" Version="1.0.0-beta076" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>

From 340a7e53836f172981794857b447c2e22a478e4f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 8 Jan 2019 14:04:37 +1100
Subject: [PATCH 09/84] Changes published index flag to y/n instead of 1/0

---
 src/Umbraco.Examine/ContentValueSetBuilder.cs    |  4 ++--
 src/Umbraco.Examine/ContentValueSetValidator.cs  |  4 ++--
 .../UmbracoContentValueSetValidatorTests.cs      | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index 18cd5e311f..0ffd9f3447 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Examine
                 var values = new Dictionary<string, IEnumerable<object>>
                 {
                     {"icon", c.ContentType.Icon.Yield()},
-                    {UmbracoExamineIndex.PublishedFieldName, new object[] {c.Published ? 1 : 0}},   //Always add invariant published value
+                    {UmbracoExamineIndex.PublishedFieldName, new object[] {c.Published ? "y" : "n"}},   //Always add invariant published value
                     {"id", new object[] {c.Id}},
                     {UmbracoExamineIndex.NodeKeyFieldName, new object[] {c.Key}},
                     {"parentID", new object[] {c.Level > 1 ? c.ParentId : -1}},
@@ -76,7 +76,7 @@ namespace Umbraco.Examine
                         values[$"nodeName_{lowerCulture}"] = PublishedValuesOnly
                             ? c.GetPublishName(culture).Yield()
                             : c.GetCultureName(culture).Yield();
-                        values[$"{UmbracoExamineIndex.PublishedFieldName}_{lowerCulture}"] = (c.IsCulturePublished(culture) ? 1 : 0).Yield<object>();
+                        values[$"{UmbracoExamineIndex.PublishedFieldName}_{lowerCulture}"] = (c.IsCulturePublished(culture) ? "y" : "n").Yield<object>();
                         values[$"updateDate_{lowerCulture}"] = PublishedValuesOnly
                             ? c.GetPublishDate(culture).Yield<object>()
                             : c.GetUpdateDate(culture).Yield<object>();
diff --git a/src/Umbraco.Examine/ContentValueSetValidator.cs b/src/Umbraco.Examine/ContentValueSetValidator.cs
index bcceafc272..9555566c53 100644
--- a/src/Umbraco.Examine/ContentValueSetValidator.cs
+++ b/src/Umbraco.Examine/ContentValueSetValidator.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Examine
                 if (!valueSet.Values.TryGetValue(UmbracoExamineIndex.PublishedFieldName, out var published))
                     return ValueSetValidationResult.Failed;
 
-                if (!published[0].Equals(1))
+                if (!published[0].Equals("y"))
                     return ValueSetValidationResult.Failed;
 
                 //deal with variants, if there are unpublished variants than we need to remove them from the value set
@@ -105,7 +105,7 @@ namespace Umbraco.Examine
                     //so this valueset is for a content that varies by culture, now check for non-published cultures and remove those values
                     foreach(var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
                     {
-                        if (publishField.Value.Count <= 0 || !publishField.Value[0].Equals(1))
+                        if (publishField.Value.Count <= 0 || !publishField.Value[0].Equals("y"))
                         {
                             //this culture is not published, so remove all of these culture values
                             var cultureSuffix = publishField.Key.Substring(publishField.Key.LastIndexOf('_'));
diff --git a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
index 08db6b35e0..8bdb0c71c7 100644
--- a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
@@ -179,7 +179,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoExamineIndex.PublishedFieldName] = 1
+                    [UmbracoExamineIndex.PublishedFieldName] = "y"
                 }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
         }
@@ -213,7 +213,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoExamineIndex.PublishedFieldName] = 0
+                    [UmbracoExamineIndex.PublishedFieldName] = "n"
                 }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
 
@@ -222,7 +222,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 {
                     ["hello"] = "world",
                     ["path"] = "-1,555",
-                    [UmbracoExamineIndex.PublishedFieldName] = 1
+                    [UmbracoExamineIndex.PublishedFieldName] = "y"
                 }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
         }
@@ -238,7 +238,7 @@ namespace Umbraco.Tests.UmbracoExamine
                     ["hello"] = "world",
                     ["path"] = "-1,555",
                     [UmbracoContentIndex.VariesByCultureFieldName] = "y",
-                    [UmbracoExamineIndex.PublishedFieldName] = 0
+                    [UmbracoExamineIndex.PublishedFieldName] = "n"
                 }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
 
@@ -248,7 +248,7 @@ namespace Umbraco.Tests.UmbracoExamine
                     ["hello"] = "world",
                     ["path"] = "-1,555",
                     [UmbracoContentIndex.VariesByCultureFieldName] = "y",
-                    [UmbracoExamineIndex.PublishedFieldName] = 1
+                    [UmbracoExamineIndex.PublishedFieldName] = "y"
                 }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
 
@@ -258,13 +258,13 @@ namespace Umbraco.Tests.UmbracoExamine
                     ["hello"] = "world",
                     ["path"] = "-1,555",
                     [UmbracoContentIndex.VariesByCultureFieldName] = "y",
-                    [$"{UmbracoExamineIndex.PublishedFieldName}_en-us"] = 1,
+                    [$"{UmbracoExamineIndex.PublishedFieldName}_en-us"] = "y",
                     ["hello_en-us"] = "world",
                     ["title_en-us"] = "my title",
-                    [$"{UmbracoExamineIndex.PublishedFieldName}_es-es"] = 0,
+                    [$"{UmbracoExamineIndex.PublishedFieldName}_es-es"] = "n",
                     ["hello_es-ES"] = "world",
                     ["title_es-ES"] = "my title",
-                    [UmbracoExamineIndex.PublishedFieldName] = 1
+                    [UmbracoExamineIndex.PublishedFieldName] = "y"
                 });
             Assert.AreEqual(10, valueSet.Values.Count());
             Assert.IsTrue(valueSet.Values.ContainsKey($"{UmbracoExamineIndex.PublishedFieldName}_es-es"));

From 801e9da028a8153b987d6bb8f6ab67f1a80323ae Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 8 Jan 2019 16:37:16 +1100
Subject: [PATCH 10/84] Fixes issue with dynamically creating/storing field
 definitions, latest examine update

---
 build/NuSpecs/UmbracoCms.Web.nuspec               |  2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj        |  2 +-
 .../UmbracoFieldDefinitionCollection.cs           | 15 +++++++++++----
 src/Umbraco.Tests/Umbraco.Tests.csproj            |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj          |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                |  2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 35e79d8127..30fa303b30 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,7 +25,7 @@
             <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
             <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
             <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-            <dependency id="Examine" version="[1.0.0-beta072,1.999999)" />
+            <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
             <dependency id="HtmlAgilityPack" version="[1.8.9,1.999999)" />
             <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
             <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 68df7b7ddd..1320f3b0d2 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta076" />
+    <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
index 8030eaecaf..1e7b51aa14 100644
--- a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
@@ -61,6 +61,11 @@ namespace Umbraco.Examine
         /// For example, we have things like `nodeName` and `__Published` which are also used for culture fields like `nodeName_en-us`
         /// and we don't want to have a full static list of all of these definitions when we can just define the one definition and then
         /// dynamically apply that to culture specific fields.
+        ///
+        /// There is a caveat to this however, when a field definition is found for a non-culture field we will create and store a new field
+        /// definition for that culture so that the next time it needs to be looked up and used we are not allocating more objects. This does mean
+        /// however that if a language is deleted, the field definitions for that language will still exist in memory. This isn't going to cause any
+        /// problems and the mem will be cleared on next site restart but it's worth pointing out.
         /// </remarks>
         public override bool TryGetValue(string fieldName, out FieldDefinition fieldDefinition)
         {
@@ -68,9 +73,7 @@ namespace Umbraco.Examine
                 return true;
 
             //before we use regex to match do some faster simple matching since this is going to execute quite a lot
-            if (!fieldName.Contains("_"))
-                return false;
-            if (!fieldName.Contains("-"))
+            if (!fieldName.Contains("_") || !fieldName.Contains("-"))
                 return false;
 
             var match = ExamineExtensions.CultureIsoCodeFieldNameMatchExpression.Match(fieldName);
@@ -78,8 +81,12 @@ namespace Umbraco.Examine
             {
                 var nonCultureFieldName = match.Groups[1].Value;
                 //check if there's a definition for this and if so return the field definition for the culture field based on the non-culture field
-                if (base.TryGetValue(nonCultureFieldName, out fieldDefinition))
+                if (base.TryGetValue(nonCultureFieldName, out var existingFieldDefinition))
+                {
+                    //now add a new field def
+                    fieldDefinition = GetOrAdd(fieldName, s => new FieldDefinition(s, existingFieldDefinition.Type));
                     return true;
+                }
             }
             return false;
         }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8a6ca29b2c..1b048f1df0 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta076" />
+    <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.9</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f3324be30f..89df5632ab 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta076" />
+    <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fd9822d172..9f65b0d16d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta076" />
+    <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>

From 086157cff8fc7d34596244265a19caa847c6936b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 12:50:36 +0100
Subject: [PATCH 11/84] Fixes #3990 All images uploaded to media section have
 umbracoHeight / umbracoWidth of 200x200px

---
 src/Umbraco.Core/IO/MediaFileSystem.cs                 |  3 ++-
 src/Umbraco.Core/Media/Exif/ImageFile.cs               |  9 +++++----
 src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs    |  3 +--
 .../Media/TypeDetector/RasterizedTypeDetector.cs       |  6 +++++-
 src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs    | 10 +++++-----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
index 39cd7ba7ad..a4305506bb 100644
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -365,7 +365,8 @@ namespace Umbraco.Core.IO
             {
                 var jpgInfo = ImageFile.FromStream(stream);
 
-                if (jpgInfo.Format != ImageFileFormat.Unknown
+                if (jpgInfo != null
+                    && jpgInfo.Format != ImageFileFormat.Unknown
                     && jpgInfo.Properties.ContainsKey(ExifTag.PixelYDimension)
                     && jpgInfo.Properties.ContainsKey(ExifTag.PixelXDimension))
                 {
diff --git a/src/Umbraco.Core/Media/Exif/ImageFile.cs b/src/Umbraco.Core/Media/Exif/ImageFile.cs
index 05a2a955c4..cfa0d90aa1 100644
--- a/src/Umbraco.Core/Media/Exif/ImageFile.cs
+++ b/src/Umbraco.Core/Media/Exif/ImageFile.cs
@@ -118,9 +118,9 @@ namespace Umbraco.Core.Media.Exif
         /// <param name="encoding">The encoding to be used for text metadata when the source encoding is unknown.</param>
 		/// <returns>The <see cref="ImageFile"/> created from the file.</returns>
         public static ImageFile FromStream(Stream stream, Encoding encoding)
-		{
+        {
             // JPEG
-            if(JPEGDetector.IsOfType(stream))
+            if (JPEGDetector.IsOfType(stream))
             {
                 return new JPEGFile(stream, encoding);
             }
@@ -137,8 +137,9 @@ namespace Umbraco.Core.Media.Exif
                 return new SVGFile(stream);
             }
 
-            throw new NotValidImageFileException ();
-		}
+            // We don't know
+            return null;
+        }
 		#endregion
 	}
 }
diff --git a/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs b/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
index 5b68f6ad88..73c8519bb6 100644
--- a/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
@@ -7,8 +7,7 @@ namespace Umbraco.Core.Media.TypeDetector
         public static bool IsOfType(Stream fileStream)
         {
             var header = GetFileHeader(fileStream);
-
-            return header[0] == 0xff && header[1] == 0xD8;
+            return header != null && header[0] == 0xff && header[1] == 0xD8;
         }
     }
 }
diff --git a/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs b/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
index 9777d55c20..858b9342fe 100644
--- a/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
@@ -7,9 +7,13 @@ namespace Umbraco.Core.Media.TypeDetector
         public static byte[] GetFileHeader(Stream fileStream)
         {
             fileStream.Seek(0, SeekOrigin.Begin);
-            byte[] header = new byte[8];
+            var header = new byte[8];
             fileStream.Seek(0, SeekOrigin.Begin);
 
+            // Invalid header
+            if (fileStream.Read(header, 0, header.Length) != header.Length)
+                return null;
+
             return header;
         }
     }
diff --git a/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs b/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
index 2a6e42d0e0..6f4a05b7af 100644
--- a/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
@@ -7,17 +7,17 @@ namespace Umbraco.Core.Media.TypeDetector
     {
         public static bool IsOfType(Stream fileStream)
         {
-            string tiffHeader = GetFileHeader(fileStream);
-
-            return tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
+            var tiffHeader = GetFileHeader(fileStream);
+            return tiffHeader != null && tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
         }
 
         public static string GetFileHeader(Stream fileStream)
         {
             var header = RasterizedTypeDetector.GetFileHeader(fileStream);
+            if (header == null)
+                return null;
 
-            string tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
-
+            var tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
             return tiffHeader;
         }
     }

From e0a38a4d9b584b88b27e2c8eb0836c6308fe1f63 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 15:53:58 +0100
Subject: [PATCH 12/84] Git clone includes a directory to clone to now,

should fix Azure Gallery release.
Tightened up the variables and paths.
---
 build/azuregalleryrelease.ps1 | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/azuregalleryrelease.ps1 b/build/azuregalleryrelease.ps1
index 502ca3010e..61505171a2 100644
--- a/build/azuregalleryrelease.ps1
+++ b/build/azuregalleryrelease.ps1
@@ -3,57 +3,57 @@
  [string]$Directory
 )
 $workingDirectory = $Directory
-CD $workingDirectory
+CD "$($workingDirectory)"
 
 # Clone repo
-$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
+$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 
 
 # Remove everything so that unzipping the release later will update everything
 # Don't remove the readme file nor the git directory
 Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
+Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git
 
 # Find release zip
-$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
+$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
 $pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
-$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
+Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
+$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })
 
 if($file)
 {
     # Get release name
-    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
-    $releaseName = "Umbraco $version"
-    Write-Host "Found $releaseName"
+    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
+    $releaseName = "Umbraco $($version)"
+    Write-Host "Found $($releaseName)"
     
     # Unzip into repository to update release
     Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
+    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
     
     # Telling git who we are
     git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
     git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
     
     # Commit
-    CD $env:GIT_REPOSITORYNAME
-    Write-Host "Committing Umbraco $version Release from Build Output"
+    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    Write-Host "Committing Umbraco $($version) Release from Build Output"
 
     git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 
 
     # Tag the release
-    git tag -a "v$version" -m "v$version"
+    git tag -a "v$($version)" -m "v$($version)"
 
     # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 
 
     #Push tag to master
-    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
+    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
 }
 else
 {
-    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
+    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
 }

From caf7a6a1ca675a674ee400f4e3d0712a020e536f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 21:32:47 +0100
Subject: [PATCH 13/84] Fixes #4000 - 7.13.0 Creating new node as an editor
 causes exception

---
 src/Umbraco.Web/Editors/ContentController.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 918f639bf1..6caf490e38 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -349,7 +349,9 @@ namespace Umbraco.Web.Editors
             var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
             // translate the content type name if applicable
             mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
-            mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
+            // if your user type doesn't have access to the Settings section it would not get this property mapped
+            if(mapped.DocumentType != null)
+                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
 
             //remove this tab if it exists: umbContainerView
             var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);

From 7658fba72574d4306f6fb7eee51ed0e1aecc0384 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 12:50:36 +0100
Subject: [PATCH 14/84] Fixes #3990 All images uploaded to media section have
 umbracoHeight / umbracoWidth of 200x200px

(cherry picked from commit 086157cff8fc7d34596244265a19caa847c6936b)
---
 src/Umbraco.Core/IO/MediaFileSystem.cs                 |  3 ++-
 src/Umbraco.Core/Media/Exif/ImageFile.cs               |  9 +++++----
 src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs    |  3 +--
 .../Media/TypeDetector/RasterizedTypeDetector.cs       |  6 +++++-
 src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs    | 10 +++++-----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
index 39cd7ba7ad..a4305506bb 100644
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -365,7 +365,8 @@ namespace Umbraco.Core.IO
             {
                 var jpgInfo = ImageFile.FromStream(stream);
 
-                if (jpgInfo.Format != ImageFileFormat.Unknown
+                if (jpgInfo != null
+                    && jpgInfo.Format != ImageFileFormat.Unknown
                     && jpgInfo.Properties.ContainsKey(ExifTag.PixelYDimension)
                     && jpgInfo.Properties.ContainsKey(ExifTag.PixelXDimension))
                 {
diff --git a/src/Umbraco.Core/Media/Exif/ImageFile.cs b/src/Umbraco.Core/Media/Exif/ImageFile.cs
index 05a2a955c4..cfa0d90aa1 100644
--- a/src/Umbraco.Core/Media/Exif/ImageFile.cs
+++ b/src/Umbraco.Core/Media/Exif/ImageFile.cs
@@ -118,9 +118,9 @@ namespace Umbraco.Core.Media.Exif
         /// <param name="encoding">The encoding to be used for text metadata when the source encoding is unknown.</param>
 		/// <returns>The <see cref="ImageFile"/> created from the file.</returns>
         public static ImageFile FromStream(Stream stream, Encoding encoding)
-		{
+        {
             // JPEG
-            if(JPEGDetector.IsOfType(stream))
+            if (JPEGDetector.IsOfType(stream))
             {
                 return new JPEGFile(stream, encoding);
             }
@@ -137,8 +137,9 @@ namespace Umbraco.Core.Media.Exif
                 return new SVGFile(stream);
             }
 
-            throw new NotValidImageFileException ();
-		}
+            // We don't know
+            return null;
+        }
 		#endregion
 	}
 }
diff --git a/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs b/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
index 5b68f6ad88..73c8519bb6 100644
--- a/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/JpegDetector.cs
@@ -7,8 +7,7 @@ namespace Umbraco.Core.Media.TypeDetector
         public static bool IsOfType(Stream fileStream)
         {
             var header = GetFileHeader(fileStream);
-
-            return header[0] == 0xff && header[1] == 0xD8;
+            return header != null && header[0] == 0xff && header[1] == 0xD8;
         }
     }
 }
diff --git a/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs b/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
index 9777d55c20..858b9342fe 100644
--- a/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/RasterizedTypeDetector.cs
@@ -7,9 +7,13 @@ namespace Umbraco.Core.Media.TypeDetector
         public static byte[] GetFileHeader(Stream fileStream)
         {
             fileStream.Seek(0, SeekOrigin.Begin);
-            byte[] header = new byte[8];
+            var header = new byte[8];
             fileStream.Seek(0, SeekOrigin.Begin);
 
+            // Invalid header
+            if (fileStream.Read(header, 0, header.Length) != header.Length)
+                return null;
+
             return header;
         }
     }
diff --git a/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs b/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
index 2a6e42d0e0..6f4a05b7af 100644
--- a/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
+++ b/src/Umbraco.Core/Media/TypeDetector/TIFFDetector.cs
@@ -7,17 +7,17 @@ namespace Umbraco.Core.Media.TypeDetector
     {
         public static bool IsOfType(Stream fileStream)
         {
-            string tiffHeader = GetFileHeader(fileStream);
-
-            return tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
+            var tiffHeader = GetFileHeader(fileStream);
+            return tiffHeader != null && tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
         }
 
         public static string GetFileHeader(Stream fileStream)
         {
             var header = RasterizedTypeDetector.GetFileHeader(fileStream);
+            if (header == null)
+                return null;
 
-            string tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
-
+            var tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
             return tiffHeader;
         }
     }

From 030fd4d37587e26078090d31905b26a6ddc0988f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 15:53:58 +0100
Subject: [PATCH 15/84] Git clone includes a directory to clone to now,

should fix Azure Gallery release.
Tightened up the variables and paths.

(cherry picked from commit e0a38a4d9b584b88b27e2c8eb0836c6308fe1f63)
---
 build/azuregalleryrelease.ps1 | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/azuregalleryrelease.ps1 b/build/azuregalleryrelease.ps1
index 502ca3010e..61505171a2 100644
--- a/build/azuregalleryrelease.ps1
+++ b/build/azuregalleryrelease.ps1
@@ -3,57 +3,57 @@
  [string]$Directory
 )
 $workingDirectory = $Directory
-CD $workingDirectory
+CD "$($workingDirectory)"
 
 # Clone repo
-$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
+$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 
 
 # Remove everything so that unzipping the release later will update everything
 # Don't remove the readme file nor the git directory
 Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
+Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git
 
 # Find release zip
-$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
+$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
 $pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
-$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
+Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
+$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })
 
 if($file)
 {
     # Get release name
-    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
-    $releaseName = "Umbraco $version"
-    Write-Host "Found $releaseName"
+    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
+    $releaseName = "Umbraco $($version)"
+    Write-Host "Found $($releaseName)"
     
     # Unzip into repository to update release
     Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
+    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
     
     # Telling git who we are
     git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
     git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
     
     # Commit
-    CD $env:GIT_REPOSITORYNAME
-    Write-Host "Committing Umbraco $version Release from Build Output"
+    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    Write-Host "Committing Umbraco $($version) Release from Build Output"
 
     git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 
 
     # Tag the release
-    git tag -a "v$version" -m "v$version"
+    git tag -a "v$($version)" -m "v$($version)"
 
     # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 
 
     #Push tag to master
-    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
+    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
 }
 else
 {
-    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
+    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
 }

From 51875539b98e51d4214d3c266ee5cef0ab681e49 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 21:32:47 +0100
Subject: [PATCH 16/84] Fixes #4000 - 7.13.0 Creating new node as an editor
 causes exception

(cherry picked from commit caf7a6a1ca675a674ee400f4e3d0712a020e536f)
---
 src/Umbraco.Web/Editors/ContentController.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 918f639bf1..6caf490e38 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -349,7 +349,9 @@ namespace Umbraco.Web.Editors
             var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
             // translate the content type name if applicable
             mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
-            mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
+            // if your user type doesn't have access to the Settings section it would not get this property mapped
+            if(mapped.DocumentType != null)
+                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
 
             //remove this tab if it exists: umbContainerView
             var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);

From 5b17072d55a832a8a6b104294c0f2fe95983d5c3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 21:45:34 +0100
Subject: [PATCH 17/84] Bump version to 7.13.1

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 8b47029965..d2cdb661f5 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.13.0")]
-[assembly: AssemblyInformationalVersion("7.13.0")]
+[assembly: AssemblyFileVersion("7.13.1")]
+[assembly: AssemblyInformationalVersion("7.13.1")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index ab71fdb40d..a63aa16824 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.13.0");
+        private static readonly Version Version = new Version("7.13.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d9b25a3b31..512d8637d8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1039,9 +1039,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7130</DevelopmentServerPort>
+          <DevelopmentServerPort>7131</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7130</IISUrl>
+          <IISUrl>http://localhost:7131</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 0f61de8bcdc2fad57246f832e7a78101ec416d3c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 8 Jan 2019 21:49:17 +0100
Subject: [PATCH 18/84] Bumps version to 7.14.0

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 8b47029965..88380ddb5f 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.13.0")]
-[assembly: AssemblyInformationalVersion("7.13.0")]
+[assembly: AssemblyFileVersion("7.14.0")]
+[assembly: AssemblyInformationalVersion("7.14.0")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index ab71fdb40d..dc2283758b 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.13.0");
+        private static readonly Version Version = new Version("7.14.0");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d9b25a3b31..ad372bb13f 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1039,9 +1039,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7130</DevelopmentServerPort>
+          <DevelopmentServerPort>7140</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7130</IISUrl>
+          <IISUrl>http://localhost:7140</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From d19a23eec6b4ab6f76ad3126f8b68bee077102f4 Mon Sep 17 00:00:00 2001
From: Floris Robbemont <florisrobbemont@users.noreply.github.com>
Date: Thu, 3 Jan 2019 16:38:37 +0100
Subject: [PATCH 19/84] Fix for wrong sorting overload in MediaService (#3948)

(cherry picked from commit 0852b20b311cbeb4efa6360c5e1e17720c4d7b16)
---
 src/Umbraco.Core/Services/MediaService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index d1f11c619a..b95a8a258c 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -509,7 +509,7 @@ namespace Umbraco.Core.Services
         public IEnumerable<IMedia> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
             string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
         {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter, null);
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter, null);
         }
 
         /// <summary>

From a16e31c671b3756d6583c245615fddab50baa783 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 6 Jan 2019 19:11:58 +0100
Subject: [PATCH 20/84] Safeguard the tags value converter against empty tags

(cherry picked from commit cc6c16894c288f422140482f55bd773e01df08f8)
---
 .../ValueConverters/TagsValueConverter.cs              | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
index b085748487..204fde0c2e 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
@@ -42,16 +42,22 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
+            var sourceAsString = source?.ToString();
+            if(sourceAsString.IsNullOrWhiteSpace())
+            {
+                return new string[0];
+            }
+
             // if Json storage type deserialzie and return as string array
             if (JsonStorageType(propertyType.DataTypeId))
             {
-                var jArray = JsonConvert.DeserializeObject<JArray>(source.ToString());
+                var jArray = JsonConvert.DeserializeObject<JArray>(sourceAsString);
                 return jArray.ToObject<string[]>();
             }
 
             // Otherwise assume CSV storage type and return as string array
             var csvTags =
-                source.ToString()
+                sourceAsString
                     .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
                     .ToArray();
             return csvTags;

From ec60ba142aae54da0ebfbe70f125932f591c948a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 9 Jan 2019 10:50:27 +0100
Subject: [PATCH 21/84] Fixes #3993 Recent changes in color picker has caused
 incompatibility with existing picker

---
 .../propertyeditors/colorpicker/colorpicker.controller.js    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index abb26ef4a2..3a6ddc5cfd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -123,6 +123,11 @@ function ColorPickerController($scope) {
         if (!$scope.model.value)
             return false;
 
+        // Backwards compatibility, the color used to be stored as a hex value only
+        if ($scope.model.value.length === 6) {
+            $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
+        }
+
         // Complex color (value and label)?
         if (!$scope.model.value.hasOwnProperty("value"))
             return $scope.model.value === color.value;

From d41dbce60125cf9a8aa30e4d5a0bf39bddb59e1a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 9 Jan 2019 11:20:34 +0100
Subject: [PATCH 22/84] Fix content picker dirty checking (#4003)

---
 .../contentpicker/contentpicker.controller.js               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index c1fe21b1b5..ee8c193b4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -35,7 +35,6 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
                 return $scope.model.config.idType === "udi" ? i.udi : i.id;                
             });
             $scope.model.value = trim(currIds.join(), ",");
-            angularHelper.getCurrentForm($scope).$setDirty();
 
             //Validate!
             if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) {
@@ -84,7 +83,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         opacity: 0.7,
         tolerance: "pointer",
         scroll: true,
-        zIndex: 6000
+        zIndex: 6000,
+        update: function (e, ui) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
     };
 
     if ($scope.model.config) {

From a809e35e5d07117c9a2d3d54050685c3253335da Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Wed, 9 Jan 2019 11:29:42 +0100
Subject: [PATCH 23/84] Fixes - temp8-40120 tags-validation-bug

---
 .../directives/components/tags/umbtagseditor.directive.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 8bad5ae8fd..fea7528d5b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -189,7 +189,7 @@
          */
         function validateMandatory() {
             return {
-                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0),
+                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0) || (vm.value != null && vm.value.length > 0),
                 errorMsg: "Value cannot be empty",
                 errorKey: "required"
             };

From fe689e68551d20e8c733752132f5cc216e5db43f Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 9 Jan 2019 12:08:46 +0100
Subject: [PATCH 24/84] Added timeout to for rebinding editor shortcuts, and a
 shortcut for a media picker.

---
 .../src/common/services/editor.service.js              | 10 ++++++----
 .../infiniteeditors/mediapicker/mediapicker.html       |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 0d6432b01f..c495c4e7a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -162,7 +162,7 @@ When building a custom infinite editor view you can use the same components as a
 (function () {
     "use strict";
 
-    function editorService(eventsService, keyboardService) {
+    function editorService(eventsService, keyboardService, $timeout) {
 
         let editorsKeyboardShorcuts = [];
         var editors = [];
@@ -246,9 +246,11 @@ When building a custom infinite editor view you can use the same components as a
             // emit event to let components know an editor has been removed
             eventsService.emit("appState.editors.close", args);
 
-            // rebind keyboard shortcuts for the new editor in focus
-            rebindKeyboardShortcuts();
-            
+            $timeout(function() {
+                // rebind keyboard shortcuts for the new editor in focus
+                rebindKeyboardShortcuts();
+            }, 0);
+
         }
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 3bb694cac6..cac412df8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -171,6 +171,7 @@
             <umb-button
                 action="close()"
                 button-style="link"
+                shortcut="esc"
                 label="Close"
                 type="button">
             </umb-button>

From 10cf10b33a4333a18e816ed5f11be2b5d7e91a6d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 9 Jan 2019 12:22:55 +0100
Subject: [PATCH 25/84] Set form as dirty when removing a tag

---
 .../src/views/propertyeditors/tags/tags.controller.js        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index 688ac7693f..a61930f877 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -1,9 +1,12 @@
 angular.module("umbraco")
 .controller("Umbraco.PropertyEditors.TagsController",
-    function ($scope) {
+    function ($scope, angularHelper) {
 
         $scope.valueChanged = function(value) {
             $scope.model.value = value;
+            // the model value seems to be a reference to the same array, so we need
+            // to set the form as dirty explicitly when the content of the array changes
+            angularHelper.getCurrentForm($scope).$setDirty();
         }
 
     }

From ff085c97ce4f8c7d7abb0510401ad0ddb17f2ae7 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 9 Jan 2019 14:57:17 +0100
Subject: [PATCH 26/84] Revert "Added eslintignore file"

This reverts commit 673735c2fed762d19fefec662bb79c435e49b763.
---
 src/Umbraco.Web.UI/.eslintignore         | 3 ---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 -
 2 files changed, 4 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/.eslintignore

diff --git a/src/Umbraco.Web.UI/.eslintignore b/src/Umbraco.Web.UI/.eslintignore
deleted file mode 100644
index 6cac59fac0..0000000000
--- a/src/Umbraco.Web.UI/.eslintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/Umbraco/**
-/Umbraco_Client/**
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 512d8637d8..dc9625f39e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -520,7 +520,6 @@
     </Content>
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
-    <Content Include=".eslintignore" />
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>

From 944d47f669b59e65ce58a4a2f8baa38e34dfc0a1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 9 Jan 2019 17:39:32 +0100
Subject: [PATCH 27/84] Refactor filesystems registration

---
 src/Umbraco.Core/Components/Composition.cs    | 123 +++++++++---------
 .../Components/CompositionExtensions.cs       |  13 +-
 .../Composing/CollectionBuilderBase.cs        |   2 +-
 .../Composers/FileSystemsComposer.cs          |  31 +++--
 .../Composing/CompositionExtensions.cs        |   9 +-
 .../Composing/FactoryExtensions.cs            |   3 +
 src/Umbraco.Core/Composing/IFactory.cs        |  12 +-
 src/Umbraco.Core/Composing/IRegister.cs       |  21 ++-
 .../Composing/LazyCollectionBuilderBase.cs    |   2 +-
 .../LightInject/LightInjectContainer.cs       |  57 ++++----
 .../Composing/OrderedCollectionBuilderBase.cs |   2 +-
 .../Composing/RegisterExtensions.cs           |  10 ++
 .../Composing/TargetedServiceProvider.cs      |  18 +++
 .../WeightedCollectionBuilderBase.cs          |   2 +-
 src/Umbraco.Core/IO/SupportingFileSystems.cs  |  11 ++
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +
 src/Umbraco.Web/Composing/ModuleInjector.cs   |   5 +-
 17 files changed, 211 insertions(+), 112 deletions(-)
 create mode 100644 src/Umbraco.Core/Composing/TargetedServiceProvider.cs
 create mode 100644 src/Umbraco.Core/IO/SupportingFileSystems.cs

diff --git a/src/Umbraco.Core/Components/Composition.cs b/src/Umbraco.Core/Components/Composition.cs
index dd0b83dcb3..6cd8c8e5f0 100644
--- a/src/Umbraco.Core/Components/Composition.cs
+++ b/src/Umbraco.Core/Components/Composition.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Components
     public class Composition : IRegister
     {
         private readonly Dictionary<Type, ICollectionBuilder> _builders = new Dictionary<Type, ICollectionBuilder>();
-        private readonly Dictionary<Type, Unique> _uniques = new Dictionary<Type, Unique>();
+        private readonly Dictionary<string, Action<IRegister>> _uniques = new Dictionary<string, Action<IRegister>>();
         private readonly IRegister _register;
 
         /// <summary>
@@ -81,14 +81,30 @@ namespace Umbraco.Core.Components
         public void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient)
             => _register.Register(serviceType, implementingType, lifetime);
 
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => _register.RegisterFor<TService, TTarget>(implementingType, lifetime);
+
         /// <inheritdoc />
         public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
             => _register.Register(factory, lifetime);
 
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => _register.RegisterFor<TService, TTarget>(factory, lifetime);
+
         /// <inheritdoc />
         public void RegisterInstance(Type serviceType, object instance)
             => _register.RegisterInstance(serviceType, instance);
 
+        /// <inheritdoc />
+        public void RegisterInstanceFor<TService, TTarget>(TService instance)
+            where TService : class
+            => _register.RegisterInstanceFor<TService, TTarget>(instance);
+
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
             => _register.RegisterAuto(serviceBaseType);
@@ -104,10 +120,12 @@ namespace Umbraco.Core.Components
                 onCreating();
 
             foreach (var unique in _uniques.Values)
-                unique.RegisterWith(_register);
+                unique(_register);
+            _uniques.Clear(); // no point keep them around
 
             foreach (var builder in _builders.Values)
                 builder.RegisterWith(_register);
+            _builders.Clear(); // no point keep them around
 
             Configs.RegisterWith(_register);
 
@@ -123,74 +141,63 @@ namespace Umbraco.Core.Components
 
         #region Unique
 
-        /// <summary>
-        /// Registers a unique service.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique(Type serviceType, Type implementingType)
-            => _uniques[serviceType] = new Unique(serviceType, implementingType);
+        private string GetUniqueName<TService>()
+            => GetUniqueName(typeof(TService));
+
+        private string GetUniqueName(Type serviceType)
+            => serviceType.FullName;
+
+        private string GetUniqueName<TService, TTarget>()
+            => GetUniqueName(typeof(TService), typeof(TTarget));
+
+        private string GetUniqueName(Type serviceType, Type targetType)
+            => serviceType.FullName + "::" + targetType.FullName;
 
         /// <summary>
         /// Registers a unique service.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique(Type serviceType, object instance)
-            => _uniques[serviceType] = new Unique(serviceType, instance);
+        public void RegisterUnique(Type serviceType, Type implementingType)
+            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, implementingType, Lifetime.Singleton);
+
+        /// <summary>
+        /// Registers a unique service, for a target.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueFor<TService, TTarget>(Type implementingType)
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(implementingType, Lifetime.Singleton);
+
+        /// <summary>
+        /// Registers a unique service.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueInstance(Type serviceType, object instance)
+            => _uniques[GetUniqueName(serviceType)] = register => register.RegisterInstance(serviceType, instance);
+
+        /// <summary>
+        /// Registers a unique service, for a target.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueInstanceFor<TService, TTarget>(TService instance)
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterInstanceFor<TService, TTarget>(instance);
 
         /// <summary>
         /// Registers a unique service.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUnique<TService>(Func<IFactory, TService> factory)
-            => _uniques[typeof(TService)] = new Unique<TService>(factory);
+            where TService : class
+            => _uniques[GetUniqueName<TService>()] = register => register.Register<TService>(factory, Lifetime.Singleton);
 
-        private class Unique
-        {
-            private readonly Type _serviceType;
-            private readonly Type _implementingType;
-            private readonly object _instance;
-
-            protected Unique(Type serviceType)
-            {
-                _serviceType = serviceType;
-            }
-
-            public Unique(Type serviceType, Type implementingType)
-                : this(serviceType)
-            {
-                _implementingType = implementingType;
-            }
-
-            public Unique(Type serviceType, object instance)
-                : this(serviceType)
-            {
-                _instance = instance;
-            }
-
-            public virtual void RegisterWith(IRegister register)
-            {
-                if (_implementingType != null)
-                    register.Register(_serviceType, _implementingType, Lifetime.Singleton);
-                else if (_instance != null)
-                    register.RegisterInstance(_serviceType, _instance);
-            }
-        }
-
-        private class Unique<TService> : Unique
-        {
-            private readonly Func<IFactory, TService> _factory;
-
-            public Unique(Func<IFactory, TService> factory)
-                : base(typeof(TService))
-            {
-                _factory = factory;
-            }
-
-            public override void RegisterWith(IRegister register)
-            {
-                register.Register(_factory, Lifetime.Singleton);
-            }
-        }
+        /// <summary>
+        /// Registers a unique service, for a target.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueFor<TService, TTarget>(Func<IFactory, TService> factory)
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(factory, Lifetime.Singleton);
 
         #endregion
 
diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 93d190d17e..a4bc82cb4b 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -26,15 +26,16 @@ namespace Umbraco.Core.Components
         /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
         /// <typeparam name="TImplementing">The implementing type.</typeparam>
         /// <param name="composition">The composition.</param>
-        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
         /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
+        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition)
             where TImplementing : FileSystemWrapper, TFileSystem
+            where TFileSystem : class
         {
             composition.RegisterUnique<TFileSystem>(factory =>
             {
                 var fileSystems = factory.GetInstance<FileSystems>();
-                return fileSystems.GetFileSystem<TImplementing>(supportingFileSystemFactory(factory));
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TImplementing>(supporting.For<TFileSystem>());
             });
         }
 
@@ -43,15 +44,15 @@ namespace Umbraco.Core.Components
         /// </summary>
         /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
         /// <param name="composition">The composition.</param>
-        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
         /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
+        public static void RegisterFileSystem<TFileSystem>(this Composition composition)
             where TFileSystem : FileSystemWrapper
         {
             composition.RegisterUnique(factory =>
             {
                 var fileSystems = factory.GetInstance<FileSystems>();
-                return fileSystems.GetFileSystem<TFileSystem>(supportingFileSystemFactory(factory));
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TFileSystem>(supporting.For<TFileSystem>());
             });
         }
 
diff --git a/src/Umbraco.Core/Composing/CollectionBuilderBase.cs b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
index 7633f6b001..41038ea4e9 100644
--- a/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class CollectionBuilderBase<TBuilder, TCollection, TItem> : ICollectionBuilder<TCollection, TItem>
         where TBuilder: CollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : IBuilderCollection<TItem>
+        where TCollection : class, IBuilderCollection<TItem>
     {
         private readonly List<Type> _types = new List<Type>();
         private readonly object _locker = new object();
diff --git a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs b/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
index f1fb095406..ab4bd015de 100644
--- a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
+++ b/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
@@ -12,10 +12,9 @@ namespace Umbraco.Core.Composing.Composers
          *
          * Create a component and use it to modify the composition by adding something like:
          *
-         *   composition.Container.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>(
-         *       factory => new PhysicalFileSystem("~/somewhere"));
+         *   composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(...);
          *
-         * return whatever supporting filesystem you like.
+         * and register whatever supporting filesystem you like.
          *
          *
          * HOW TO IMPLEMENT MY OWN FILESYSTEM
@@ -30,12 +29,15 @@ namespace Umbraco.Core.Composing.Composers
          *       { }
          *   }
          *
-         * The ctor can have more parameters that will be resolved by the container.
+         * The ctor can have more parameters, that will be resolved by the container.
          *
          * Register your filesystem, in a component:
          *
-         *    composition.Container.RegisterFileSystem<MyFileSystem>(
-         *        factory => new PhysicalFileSystem("~/my"));
+         *   composition.RegisterFileSystem<MyFileSystem>();
+         *
+         * Register the underlying filesystem:
+         *
+         *   composition.RegisterUniqueFor<IFileSystem, MyFileSystem>(...);
          *
          * And that's it, you can inject MyFileSystem wherever it's needed.
          *
@@ -48,8 +50,8 @@ namespace Umbraco.Core.Composing.Composers
          * Make the class implement the interface, then
          * register your filesystem, in a component:
          *
-         *    composition.Container.RegisterFileSystem<IMyFileSystem, MyFileSystem>(
-         *        factory => new PhysicalFileSystem("~/my"));
+         *   composition.RegisterFileSystem<IMyFileSystem, MyFileSystem>();
+         *   composition.RegisterUniqueFor<IFileSystem, IMyFileSystem>(...);
          *
          * And that's it, you can inject IMyFileSystem wherever it's needed.
          *
@@ -79,9 +81,16 @@ namespace Umbraco.Core.Composing.Composers
             // register the scheme for media paths
             composition.RegisterUnique<IMediaPathScheme, TwoGuidsMediaPathScheme>();
 
-            // register the IMediaFileSystem implementation with a supporting filesystem
-            composition.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>(
-                factory => new PhysicalFileSystem("~/media"));
+            // register the IMediaFileSystem implementation
+            composition.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>();
+
+            // register the supporting filesystems provider
+            composition.Register(factory => new SupportingFileSystems(factory), Lifetime.Singleton);
+
+            // register the IFileSystem supporting the IMediaFileSystem
+            // this is the only thing that need to be overriden to change the supporting filesystem
+            // and, SupportingFileSystem.For<IMediaFileSystem>() returns the underlying filesystem
+            composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => new PhysicalFileSystem("~/media"));
 
             return composition;
         }
diff --git a/src/Umbraco.Core/Composing/CompositionExtensions.cs b/src/Umbraco.Core/Composing/CompositionExtensions.cs
index cfc465b59d..ac9a5d6409 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions.cs
@@ -51,11 +51,18 @@ namespace Umbraco.Core.Composing
         public static void RegisterUnique<TService, TImplementing>(this Composition composition)
             => composition.RegisterUnique(typeof(TService), typeof(TImplementing));
 
+        /// <summary>
+        /// Registers a unique service with an implementation type, for a target.
+        /// </summary>
+        public static void RegisterUniqueFor<TService, TTarget, TImplementing>(this Composition composition)
+            where TService : class
+            => composition.RegisterUniqueFor<TService, TTarget>(typeof(TImplementing));
+
         /// <summary>
         /// Registers a unique service with an implementing instance.
         /// </summary>
         public static void RegisterUnique<TService>(this Composition composition, TService instance)
-            => composition.RegisterUnique(typeof(TService), instance);
+            => composition.RegisterUniqueInstance(typeof(TService), instance);
 
         #endregion
     }
diff --git a/src/Umbraco.Core/Composing/FactoryExtensions.cs b/src/Umbraco.Core/Composing/FactoryExtensions.cs
index 2640b7f7e6..8027f2c7a1 100644
--- a/src/Umbraco.Core/Composing/FactoryExtensions.cs
+++ b/src/Umbraco.Core/Composing/FactoryExtensions.cs
@@ -17,6 +17,7 @@ namespace Umbraco.Core.Composing
         /// <returns>An instance of the specified type.</returns>
         /// <remarks>Throws an exception if the factory failed to get an instance of the specified type.</remarks>
         public static T GetInstance<T>(this IFactory factory)
+            where T : class
             => (T)factory.GetInstance(typeof(T));
 
         /// <summary>
@@ -28,6 +29,7 @@ namespace Umbraco.Core.Composing
         /// of the specified type. Throws an exception if the factory does know how
         /// to get an instance of the specified type, but failed to do so.</remarks>
         public static T TryGetInstance<T>(this IFactory factory)
+            where T : class
             => (T)factory.TryGetInstance(typeof(T));
 
         /// <summary>
@@ -42,6 +44,7 @@ namespace Umbraco.Core.Composing
         /// <para>The arguments are used as dependencies by the factory.</para>
         /// </remarks>
         public static T CreateInstance<T>(this IFactory factory, params object[] args)
+            where T : class
             => (T)factory.CreateInstance(typeof(T), args);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Composing/IFactory.cs b/src/Umbraco.Core/Composing/IFactory.cs
index 9a59b1c052..20fbe33737 100644
--- a/src/Umbraco.Core/Composing/IFactory.cs
+++ b/src/Umbraco.Core/Composing/IFactory.cs
@@ -28,6 +28,15 @@ namespace Umbraco.Core.Composing
         /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
         object GetInstance(Type type);
 
+        /// <summary>
+        /// Gets a targeted instance of a service.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <typeparam name="TTarget">The type of the target.</typeparam>
+        /// <returns>The instance of the specified type for the specified target.</returns>
+        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
+        TService GetInstanceFor<TService, TTarget>();
+
         /// <summary>
         /// Tries to get an instance of a service.
         /// </summary>
@@ -48,7 +57,8 @@ namespace Umbraco.Core.Composing
         /// Gets all instances of a service.
         /// </summary>
         /// <typeparam name="TService">The type of the service.</typeparam>
-        IEnumerable<TService> GetAllInstances<TService>();
+        IEnumerable<TService> GetAllInstances<TService>()
+            where TService : class;
 
         /// <summary>
         /// Releases an instance.
diff --git a/src/Umbraco.Core/Composing/IRegister.cs b/src/Umbraco.Core/Composing/IRegister.cs
index 8ad3db5409..d145df8790 100644
--- a/src/Umbraco.Core/Composing/IRegister.cs
+++ b/src/Umbraco.Core/Composing/IRegister.cs
@@ -33,16 +33,35 @@ namespace Umbraco.Core.Composing
         /// </summary>
         void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient);
 
+        /// <summary>
+        /// Registers a service with an implementation type, for a target.
+        /// </summary>
+        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class;
+
         /// <summary>
         /// Registers a service with an implementation factory.
         /// </summary>
-        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient);
+        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class;
+
+        /// <summary>
+        /// Registers a service with an implementation factory, for a target.
+        /// </summary>
+        void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class;
 
         /// <summary>
         /// Registers a service with an implementing instance.
         /// </summary>
         void RegisterInstance(Type serviceType, object instance);
 
+        /// <summary>
+        /// Registers a service with an implementing instance, for a target.
+        /// </summary>
+        void RegisterInstanceFor<TService, TTarget>(TService instance)
+            where TService : class;
+
         /// <summary>
         /// Registers a base type for auto-registration.
         /// </summary>
diff --git a/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs
index a1a06621e9..46b06daf7d 100644
--- a/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class LazyCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
         where TBuilder : LazyCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : IBuilderCollection<TItem>
+        where TCollection : class, IBuilderCollection<TItem>
     {
         private readonly List<Func<IEnumerable<Type>>> _producers = new List<Func<IEnumerable<Type>>>();
         private readonly List<Type> _excluded = new List<Type>();
diff --git a/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs b/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
index b39622f66a..4ccc0ba838 100644
--- a/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
+++ b/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
@@ -102,18 +102,25 @@ namespace Umbraco.Core.Composing.LightInject
         /// <inheritdoc />
         public IFactory CreateFactory() => this;
 
+        private static string GetTargetedServiceName<TTarget>() => "TARGET:" + typeof(TTarget).FullName;
+
         #region Factory
 
         /// <inheritdoc />
         public object GetInstance(Type type)
             => Container.GetInstance(type);
 
+        /// <inheritdoc />
+        public TService GetInstanceFor<TService, TTarget>()
+            => Container.GetInstance<TService>(GetTargetedServiceName<TTarget>());
+
         /// <inheritdoc />
         public object TryGetInstance(Type type)
             => Container.TryGetInstance(type);
 
         /// <inheritdoc />
         public IEnumerable<T> GetAllInstances<T>()
+            where T : class
             => Container.GetAllInstances<T>();
 
         /// <inheritdoc />
@@ -139,19 +146,7 @@ namespace Umbraco.Core.Composing.LightInject
         /// <inheritdoc />
         public void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient)
         {
-            switch (lifetime)
-            {
-                case Lifetime.Transient:
-                    Container.Register(serviceType);
-                    break;
-                case Lifetime.Request:
-                case Lifetime.Scope:
-                case Lifetime.Singleton:
-                    Container.Register(serviceType, GetLifetime(lifetime));
-                    break;
-                default:
-                    throw new NotSupportedException($"Lifetime {lifetime} is not supported.");
-            }
+            Container.Register(serviceType, GetLifetime(lifetime));
         }
 
         /// <inheritdoc />
@@ -173,21 +168,24 @@ namespace Umbraco.Core.Composing.LightInject
         }
 
         /// <inheritdoc />
-        public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
         {
-            switch (lifetime)
-            {
-                case Lifetime.Transient:
-                    Container.Register(f => factory(this));
-                    break;
-                case Lifetime.Request:
-                case Lifetime.Scope:
-                case Lifetime.Singleton:
-                    Container.Register(f => factory(this), GetLifetime(lifetime));
-                    break;
-                default:
-                    throw new NotSupportedException($"Lifetime {lifetime} is not supported.");
-            }
+            Container.Register(typeof(TService), implementingType, GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
+        }
+
+        /// <inheritdoc />
+        public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+        {
+            Container.Register(f => factory(this), GetLifetime(lifetime));
+        }
+
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+        {
+            Container.Register(f => factory(this), GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
         }
 
         private ILifetime GetLifetime(Lifetime lifetime)
@@ -211,6 +209,11 @@ namespace Umbraco.Core.Composing.LightInject
         public void RegisterInstance(Type serviceType, object instance)
             => Container.RegisterInstance(serviceType, instance);
 
+        /// <inheritdoc />
+        public void RegisterInstanceFor<TService, TTarget>(TService instance)
+            where TService : class
+            => Container.RegisterInstance(typeof(TService), instance, GetTargetedServiceName<TTarget>());
+
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
         {
diff --git a/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
index bde1bf96c5..241b84d8d2 100644
--- a/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class OrderedCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
         where TBuilder : OrderedCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : IBuilderCollection<TItem>
+        where TCollection : class, IBuilderCollection<TItem>
     {
         protected abstract TBuilder This { get; }
 
diff --git a/src/Umbraco.Core/Composing/RegisterExtensions.cs b/src/Umbraco.Core/Composing/RegisterExtensions.cs
index 4db1a2e9e4..9afa41e4b3 100644
--- a/src/Umbraco.Core/Composing/RegisterExtensions.cs
+++ b/src/Umbraco.Core/Composing/RegisterExtensions.cs
@@ -11,22 +11,32 @@
         public static void Register<TService, TImplementing>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
             => register.Register(typeof(TService), typeof(TImplementing), lifetime);
 
+        /// <summary>
+        /// Registers a service with an implementation type, for a target.
+        /// </summary>
+        public static void RegisterFor<TService, TTarget, TImplementing>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => register.RegisterFor<TService, TTarget>(typeof(TImplementing), lifetime);
+
         /// <summary>
         /// Registers a service as its own implementation.
         /// </summary>
         public static void Register<TService>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
             => register.Register(typeof(TService), lifetime);
 
         /// <summary>
         /// Registers a service with an implementing instance.
         /// </summary>
         public static void RegisterInstance<TService>(this IRegister register, TService instance)
+            where TService : class
             => register.RegisterInstance(typeof(TService), instance);
 
         /// <summary>
         /// Registers a base type for auto-registration.
         /// </summary>
         public static void RegisterAuto<TServiceBase>(this IRegister register)
+            where TServiceBase : class
             => register.RegisterAuto(typeof(TServiceBase));
     }
 }
diff --git a/src/Umbraco.Core/Composing/TargetedServiceProvider.cs b/src/Umbraco.Core/Composing/TargetedServiceProvider.cs
new file mode 100644
index 0000000000..3f88e1bc28
--- /dev/null
+++ b/src/Umbraco.Core/Composing/TargetedServiceProvider.cs
@@ -0,0 +1,18 @@
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Provides a base class for targeted service factories.
+    /// </summary>
+    /// <typeparam name="TService"></typeparam>
+    public abstract class TargetedServiceProvider<TService>
+    {
+        private readonly IFactory _factory;
+
+        protected TargetedServiceProvider(IFactory factory)
+        {
+            _factory = factory;
+        }
+
+        public TService For<TTarget>() => _factory.GetInstanceFor<TService, TTarget>();
+    }
+}
diff --git a/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
index da47c53bf8..f8ecc11d98 100644
--- a/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class WeightedCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
         where TBuilder : WeightedCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : IBuilderCollection<TItem>
+        where TCollection : class, IBuilderCollection<TItem>
     {
         protected abstract TBuilder This { get; }
 
diff --git a/src/Umbraco.Core/IO/SupportingFileSystems.cs b/src/Umbraco.Core/IO/SupportingFileSystems.cs
new file mode 100644
index 0000000000..c13ae203ee
--- /dev/null
+++ b/src/Umbraco.Core/IO/SupportingFileSystems.cs
@@ -0,0 +1,11 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.IO
+{
+    public class SupportingFileSystems : TargetedServiceProvider<IFileSystem>
+    {
+        public SupportingFileSystems(IFactory factory)
+            : base(factory)
+        { }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a01bbf1746..a592fd0f0e 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -196,6 +196,7 @@
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
     <Compile Include="Composing\OrderedCollectionBuilderBase.cs" />
+    <Compile Include="Composing\TargetedServiceProvider.cs" />
     <Compile Include="Composing\TypeFinder.cs" />
     <Compile Include="Composing\TypeHelper.cs" />
     <Compile Include="Composing\TypeLoader.cs" />
@@ -343,6 +344,7 @@
     <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
+    <Compile Include="IO\SupportingFileSystems.cs" />
     <Compile Include="KeyValuePairExtensions.cs" />
     <Compile Include="Logging\IProfilingLogger.cs" />
     <Compile Include="Logging\LogHttpRequest.cs" />
diff --git a/src/Umbraco.Web/Composing/ModuleInjector.cs b/src/Umbraco.Web/Composing/ModuleInjector.cs
index 01930d55fd..57ef766dea 100644
--- a/src/Umbraco.Web/Composing/ModuleInjector.cs
+++ b/src/Umbraco.Web/Composing/ModuleInjector.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Web;
+using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
@@ -11,7 +10,7 @@ namespace Umbraco.Web.Composing
     /// </summary>
     /// <typeparam name="TModule">The type of the injected module.</typeparam>
     public abstract class ModuleInjector<TModule> : IHttpModule
-        where TModule : IHttpModule
+        where TModule : class, IHttpModule
     {
         protected TModule Module { get; private set; }
 

From d2baf0311976cc45d6161853c08336656091c344 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 9 Jan 2019 11:20:34 +0100
Subject: [PATCH 28/84] Fix content picker dirty checking (#4003)

(cherry picked from commit d41dbce60125cf9a8aa30e4d5a0bf39bddb59e1a)
---
 .../contentpicker/contentpicker.controller.js               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index c1fe21b1b5..ee8c193b4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -35,7 +35,6 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
                 return $scope.model.config.idType === "udi" ? i.udi : i.id;                
             });
             $scope.model.value = trim(currIds.join(), ",");
-            angularHelper.getCurrentForm($scope).$setDirty();
 
             //Validate!
             if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) {
@@ -84,7 +83,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         opacity: 0.7,
         tolerance: "pointer",
         scroll: true,
-        zIndex: 6000
+        zIndex: 6000,
+        update: function (e, ui) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
     };
 
     if ($scope.model.config) {

From d69f0fe9ddf8c8d37f4fe4d27b5974cddf4f88d3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 10 Jan 2019 15:35:48 +0100
Subject: [PATCH 29/84] #3993 Move color picker fix to correct method and
 update backwards compatibility test

---
 .../colorpicker/colorpicker.controller.js              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 3a6ddc5cfd..9b3be511a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -123,11 +123,6 @@ function ColorPickerController($scope) {
         if (!$scope.model.value)
             return false;
 
-        // Backwards compatibility, the color used to be stored as a hex value only
-        if ($scope.model.value.length === 6) {
-            $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
-        }
-
         // Complex color (value and label)?
         if (!$scope.model.value.hasOwnProperty("value"))
             return $scope.model.value === color.value;
@@ -144,6 +139,11 @@ function ColorPickerController($scope) {
         if (!$scope.model.value)
             return;
 
+        // Backwards compatibility, the color used to be stored as a hex value only
+        if (typeof $scope.model.value === "string") {
+            $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
+        }
+
         // Complex color (value and label)?
         if (!$scope.model.value.hasOwnProperty("value"))
             return;

From cc13b99787de8f94b40c0cd6d289b2b9bdc3251e Mon Sep 17 00:00:00 2001
From: Sebastian Hoffback <sebastian.claesson@gmail.com>
Date: Thu, 10 Jan 2019 11:21:17 +0100
Subject: [PATCH 30/84] Removed already deleted file canvasdesigner.panel.js
 from canvasdesigner.loader.js

---
 src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
index c5d2f70075..8ed149fee1 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
@@ -11,8 +11,7 @@ LazyLoad.js([
       '../js/umbraco.security.js',
       '../ServerVariables',
       '../lib/spectrum/spectrum.js',
-      '../js/umbraco.canvasdesigner.js',
-	  '../js/canvasdesigner.panel.js'
+      '../js/umbraco.canvasdesigner.js'
 ], function () {
     jQuery(document).ready(function () {
         angular.bootstrap(document, ['Umbraco.canvasdesigner']);

From 4170faf76eddee2bae14470ace42886e12601c3d Mon Sep 17 00:00:00 2001
From: Quan Tran <quan.t@bokio.se>
Date: Wed, 9 Jan 2019 09:02:15 +0100
Subject: [PATCH 31/84] add null checking

---
 .../umbraco.presentation/umbraco/translation/details.aspx.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
index 46a00927db..b8968d4329 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
@@ -88,7 +88,10 @@ namespace umbraco.presentation.umbraco.translation {
             foreach (PropertyType pt in page.ContentType.PropertyTypes) {
                 pageRow = pageTable.NewRow();
                 pageRow[ui.Text("name")] = pt.Name;
-                pageRow[ui.Text("value")] = page.getProperty(pt.Alias).Value;
+                if (page.getProperty(pt.Alias) != null && page.getProperty(pt.Alias).Value != null)
+                {
+                    pageRow[ui.Text("value")] = page.getProperty(pt.Alias).Value;
+                }
                 pageTable.Rows.Add(pageRow);
             }
             

From 59349dd355313063718c136b6b641de487af3e5b Mon Sep 17 00:00:00 2001
From: Quan Tran <quan.t@bokio.se>
Date: Thu, 10 Jan 2019 10:21:07 +0100
Subject: [PATCH 32/84] Fix - refine code

---
 .../umbraco/translation/details.aspx.cs              | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
index b8968d4329..d4ae4a8587 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
@@ -84,17 +84,19 @@ namespace umbraco.presentation.umbraco.translation {
             pageRow[ui.Text("name")] = ui.Text("nodeName");
             pageRow[ui.Text("value")] = page.Text;
             pageTable.Rows.Add(pageRow);
-            
-            foreach (PropertyType pt in page.ContentType.PropertyTypes) {
+
+            foreach (PropertyType pt in page.ContentType.PropertyTypes)
+            {
                 pageRow = pageTable.NewRow();
                 pageRow[ui.Text("name")] = pt.Name;
-                if (page.getProperty(pt.Alias) != null && page.getProperty(pt.Alias).Value != null)
+                var property = page.getProperty(pt.Alias);
+                if (property != null && property.Value != null)
                 {
-                    pageRow[ui.Text("value")] = page.getProperty(pt.Alias).Value;
+                    pageRow[ui.Text("value")] = property.Value;
                 }
                 pageTable.Rows.Add(pageRow);
             }
-            
+
             dg_fields.DataSource = pageTable;
             dg_fields.DataBind();
         }

From a5630a34480cd938f95ae992ec94bcb0b02b2547 Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Fri, 11 Jan 2019 14:35:24 +1100
Subject: [PATCH 33/84] Fixing 4033 by using the right Logger instance

---
 src/Umbraco.Core/Runtime/CoreRuntime.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index 5d2359d04c..cb6a1cb031 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -319,7 +319,7 @@ namespace Umbraco.Core.Runtime
         /// Gets a profiler.
         /// </summary>
         protected virtual IProfiler GetProfiler()
-            => new LogProfiler(ProfilingLogger);
+            => new LogProfiler(Logger);
 
         /// <summary>
         /// Gets the application caches.

From ba282ab81ab7ec85b3a6bf54c1c7a2d7adbae100 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 11 Jan 2019 08:26:53 +0100
Subject: [PATCH 34/84] Comments

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

diff --git a/src/Umbraco.Web/IPublishedContentQuery.cs b/src/Umbraco.Web/IPublishedContentQuery.cs
index c3a065b9dc..76e7be5e97 100644
--- a/src/Umbraco.Web/IPublishedContentQuery.cs
+++ b/src/Umbraco.Web/IPublishedContentQuery.cs
@@ -40,6 +40,7 @@ namespace Umbraco.Web
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
         /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
         IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null);
 
@@ -54,17 +55,24 @@ namespace Umbraco.Web
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
         /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
         IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null);
 
         /// <summary>
         /// Executes the query and converts the results to PublishedSearchResult.
         /// </summary>
+        /// <remarks>
+        /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
+        /// </remarks>
         IEnumerable<PublishedSearchResult> Search(IQueryExecutor query);
 
         /// <summary>
         /// Executes the query and converts the results to PublishedSearchResult.
         /// </summary>
+        /// <remarks>
+        /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
+        /// </remarks>
         IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip, int take, out long totalRecords);
     }
 }

From 250c24de40f70a9f1b995934e45f394f1b4597ff Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 11 Jan 2019 12:54:50 +0000
Subject: [PATCH 35/84] Adds in chart.js & the angular wrapper library

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 56 ++++++++++++++++++-
 src/Umbraco.Web.UI.Client/package.json        |  2 +
 src/Umbraco.Web/UI/JavaScript/JsInitialize.js |  5 +-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 7c3fe8b4f9..b12843fbf7 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -852,6 +852,26 @@
       "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.5.tgz",
       "integrity": "sha512-kU/fHIGf2a4a3bH7E1tzALTHk+QfoUSCK9fEcMFisd6ZWvNDwPzXWAilItqOC3EDiAXPmGHaNc9/aXiD9xrAxQ=="
     },
+    "angular-chart.js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/angular-chart.js/-/angular-chart.js-1.1.1.tgz",
+      "integrity": "sha1-SfDhjQgXYrbUyXkeSHr/L7sw9a4=",
+      "requires": {
+        "angular": "1.x",
+        "chart.js": "2.3.x"
+      },
+      "dependencies": {
+        "chart.js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.3.0.tgz",
+          "integrity": "sha1-QEYOSOLEF8BfwzJc2E97AA3H19Y=",
+          "requires": {
+            "chartjs-color": "^2.0.0",
+            "moment": "^2.10.6"
+          }
+        }
+      }
+    },
     "angular-cookies": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.5.tgz",
@@ -1970,6 +1990,39 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "chart.js": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.3.tgz",
+      "integrity": "sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==",
+      "requires": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "chartjs-color": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
+      "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
+      "requires": {
+        "chartjs-color-string": "^0.5.0",
+        "color-convert": "^0.5.3"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+        }
+      }
+    },
+    "chartjs-color-string": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
+      "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
+      "requires": {
+        "color-name": "^1.0.0"
+      }
+    },
     "chokidar": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
@@ -2216,8 +2269,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "1.5.3",
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 2002cca0a1..e35fdc3442 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -8,6 +8,7 @@
     "ace-builds": "1.4.2",
     "angular": "1.7.5",
     "angular-animate": "1.7.5",
+    "angular-chart.js": "^1.1.1",
     "angular-cookies": "1.7.5",
     "angular-dynamic-locale": "0.1.37",
     "angular-i18n": "1.7.5",
@@ -20,6 +21,7 @@
     "angular-ui-sortable": "0.19.0",
     "animejs": "2.2.0",
     "bootstrap-social": "5.1.1",
+    "chart.js": "^2.7.3",
     "clipboard": "2.0.4",
     "diff": "3.5.0",
     "flatpickr": "4.5.2",
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index 75ca46437a..62d294ee6f 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -23,8 +23,11 @@
     'lib/ng-file-upload/ng-file-upload.min.js',
     'lib/angular-local-storage/angular-local-storage.min.js',
 
+    'lib/chart.js/chart.min.js',
+    'lib/angular-chart.js/angular-chart.min.js',
+
     'lib/umbraco/Extensions.js',
-    
+
     'lib/umbraco/NamespaceManager.js',
     'lib/umbraco/LegacySpeechBubble.js',
 

From 8f1cd8110d9488bfc9608055b14ce4cccdbd0b92 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 11 Jan 2019 13:27:39 +0000
Subject: [PATCH 36/84] Adds in the missing chart.js & wrapper lib (part of it
 was put in the solution it seems but not fully merged in correctly perhaps?!)

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 11 +++++++++++
 src/Umbraco.Web.UI.Client/src/app.js  |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 0af327d148..22ac11b991 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -248,6 +248,17 @@ gulp.task('dependencies', function () {
             "src":  ["./node_modules/bootstrap-social/bootstrap-social.css"],
             "base": "./node_modules/bootstrap-social"
         },
+
+        {
+            "name": "angular-chart.js",
+            "src":  ["./node_modules/angular-chart.js/dist/angular-chart.min.js"],
+            "base": "./node_modules/angular-chart.js/dist"
+        },
+        {
+            "name": "chart.js",
+            "src":  ["./node_modules/chart.js/dist/chart.min.js"],
+            "base": "./node_modules/chart.js/dist"
+        },
         {
             "name": "clipboard",
             "src":  ["./node_modules/clipboard/dist/clipboard.min.js"],
diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js
index c7b813c1bf..8e0eaa4943 100644
--- a/src/Umbraco.Web.UI.Client/src/app.js
+++ b/src/Umbraco.Web.UI.Client/src/app.js
@@ -14,7 +14,8 @@ var app = angular.module('umbraco', [
     'ngMessages',
     'tmh.dynamicLocale',
     'ngFileUpload',
-    'LocalStorageModule'
+    'LocalStorageModule',
+    'chart.js'
 ]);
 
 app.config(['$compileProvider', function ($compileProvider) {
@@ -76,7 +77,7 @@ angular.module("umbraco.viewcache", [])
                             var _op = (url.indexOf("?") > 0) ? "&" : "?";
                             url += _op + "umb__rnd=" + rnd;
                         }
-                        
+
                         return get(url, config);
                     };
                     return $delegate;

From fded793f8e96e40fe77fe87684932c04e8824835 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 11 Jan 2019 13:32:45 +0000
Subject: [PATCH 37/84] Removes the accidently Web.UI.csproj V7 port numbers
 for IISExpress when merging up from V7 to V8

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 05bc1dca73..7a59b15eb3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -433,12 +433,6 @@
           <DevelopmentServerPort>8000</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8000</IISUrl>
-          <DevelopmentServerPort>7140</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7140</IISUrl>
-          <DevelopmentServerPort>7131</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7131</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From ca75b2f4d369f4705d5df7efca00d2c006c04914 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 11 Jan 2019 14:53:55 +0100
Subject: [PATCH 38/84] Fix recent Examine changes

---
 .../XmlPublishedCache/DictionaryPublishedContent.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
index a845be286f..6f6a39144a 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             LoadedFromExamine = fromExamine;
 
             ValidateAndSetProperty(valueDictionary, val => _id = Int32.Parse(val), "id", "nodeId", "__NodeId"); //should validate the int!
-            ValidateAndSetProperty(valueDictionary, val => _key = Guid.Parse(val), "key");
+            ValidateAndSetProperty(valueDictionary, val => _key = Guid.Parse(val), "key", "__key", "__Key");
             //ValidateAndSetProperty(valueDictionary, val => _templateId = int.Parse(val), "template", "templateId");
             ValidateAndSetProperty(valueDictionary, val => _sortOrder = Int32.Parse(val), "sortOrder");
             ValidateAndSetProperty(valueDictionary, val => _name = val, "nodeName");

From e88c789b88f85e36e672ce7881fec6d0995b7145 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 11 Jan 2019 15:44:54 +0100
Subject: [PATCH 39/84] Add some defensive coding to avoid JS errors

---
 .../components/content/umbcontentnodeinfo.directive.js        | 4 ++--
 1 file changed, 2 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 71fbabe943..b65bf447e7 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
@@ -97,9 +97,9 @@
                 }
 
                 //load in the audit trail if we are currently looking at the INFO tab
-                if (umbVariantContentCtrl) {
+                if (umbVariantContentCtrl && umbVariantContentCtrl.editor) {
                     var activeApp = _.find(umbVariantContentCtrl.editor.content.apps, a => a.active);
-                    if (activeApp.alias === "umbInfo") {
+                    if (activeApp && activeApp.alias === "umbInfo") {
                         isInfoTab = true;
                         loadAuditTrail();
                         loadRedirectUrls();

From 291d58900ff2ad3f4e3772857748301aa70a1f3b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 13 Jan 2019 12:42:42 +0100
Subject: [PATCH 40/84] V8: Remember editor language between sessions (#4035)

---
 .../src/controllers/navigation.controller.js  | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index 06b82d6eab..335fe99e7c 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -9,7 +9,7 @@
  *
  * @param {navigationService} navigationService A reference to the navigationService
  */
-function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource) {
+function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource) {
 
     //this is used to trigger the tree to start loading once everything is ready
     var treeInitPromise = $q.defer();
@@ -344,9 +344,6 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             $scope.languages = languages;
 
             if ($scope.languages.length > 1) {
-                var defaultLang = _.find($scope.languages, function (l) {
-                    return l.isDefault;
-                });
                 //if there's already one set, check if it exists
                 var currCulture = null;
                 var mainCulture = $location.search().mculture;
@@ -356,7 +353,18 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
                     });
                 }
                 if (!currCulture) {
-                    $location.search("mculture", defaultLang ? defaultLang.culture : null);
+                    // no culture in the request, let's look for one in the cookie that's set when changing language
+                    var defaultCulture = $cookies.get("UMB_MCULTURE");
+                    if (!defaultCulture) {
+                        // no luck either, look for the default language
+                        var defaultLang = _.find($scope.languages, function (l) {
+                            return l.isDefault;
+                        });
+                        if (defaultLang) {
+                            defaultCulture = defaultLang.culture;
+                        }
+                    }
+                    $location.search("mculture", defaultCulture ? defaultCulture : null);
                 }
             }
 
@@ -391,6 +399,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     $scope.selectLanguage = function (language) {
 
         $location.search("mculture", language.culture);
+        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie max age is one year = 31536000 seconds)
+        // NOTE: $cookies doesn't support max-age, so we need to go the good ol' JS way about setting the cookie
+        document.cookie = "UMB_MCULTURE=" +language.culture + ";path=/;max-age=31536000;";
 
         // close the language selector
         $scope.page.languageSelectorIsOpen = false;

From c619b79276be80db73442cee0b4dfd4b975bfed9 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 13 Jan 2019 13:06:16 +0100
Subject: [PATCH 41/84] Fix placeholder text when empty alias input after
 generating alias (#4032)

---
 .../components/umbGenerateAlias.directive.js  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
index 47d1431e13..56a18a217e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
@@ -86,20 +86,21 @@ angular.module("umbraco.directives")
                 function generateAlias(value) {
 
                   if (generateAliasTimeout) {
-                    $timeout.cancel(generateAliasTimeout);
+                     $timeout.cancel(generateAliasTimeout);
                   }
 
-                  if( value !== undefined && value !== "" && value !== null) {
+                  if (value !== undefined && value !== "" && value !== null) {
 
-                      scope.alias = "";
+                    scope.alias = "";
                     scope.placeholderText = scope.labels.busy;
 
                     generateAliasTimeout = $timeout(function () {
                        updateAlias = true;
                         entityResource.getSafeAlias(value, true).then(function (safeAlias) {
                             if (updateAlias) {
-                              scope.alias = safeAlias.alias;
-                           }
+                                scope.alias = safeAlias.alias;
+                            }
+                            scope.placeholderText = scope.labels.idle;
                       });
                     }, 500);
 
@@ -108,7 +109,6 @@ angular.module("umbraco.directives")
                     scope.alias = "";
                     scope.placeholderText = scope.labels.idle;
                   }
-
                 }
 
                 // if alias gets unlocked - stop watching alias
@@ -119,17 +119,17 @@ angular.module("umbraco.directives")
                 }));
 
                 // validate custom entered alias
-                eventBindings.push(scope.$watch('alias', function(newValue, oldValue){
-
-                  if(scope.alias === "" && bindWatcher === true || scope.alias === null && bindWatcher === true) {
-                    // add watcher
-                    eventBindings.push(scope.$watch('aliasFrom', function(newValue, oldValue) {
-                       if(bindWatcher) {
-                          generateAlias(newValue);
-                       }
-                    }));
-                  }
-
+                eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
+                    if (scope.alias === "" || scope.alias === null || scope.alias === undefined) {
+                        if (bindWatcher === true) {
+                            // add watcher
+                            eventBindings.push(scope.$watch('aliasFrom', function (newValue, oldValue) {
+                                if (bindWatcher) {
+                                    generateAlias(newValue);
+                                }
+                            }));
+                        }
+                    }
                }));
 
                // clean up

From 2ebd7a077cc5e71bd476f3f71d18d6ab16723e0c Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 13 Jan 2019 13:06:16 +0100
Subject: [PATCH 42/84] Fix placeholder text when empty alias input after
 generating alias (#4032)

(cherry picked from commit c619b79276be80db73442cee0b4dfd4b975bfed9)
---
 .../components/umbGenerateAlias.directive.js  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
index 9b4bd17a12..b6c53d3876 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
@@ -86,20 +86,21 @@ angular.module("umbraco.directives")
                 function generateAlias(value) {
 
                   if (generateAliasTimeout) {
-                    $timeout.cancel(generateAliasTimeout);
+                     $timeout.cancel(generateAliasTimeout);
                   }
 
-                  if( value !== undefined && value !== "" && value !== null) {
+                  if (value !== undefined && value !== "" && value !== null) {
 
-                      scope.alias = "";
+                    scope.alias = "";
                     scope.placeholderText = scope.labels.busy;
 
                     generateAliasTimeout = $timeout(function () {
                        updateAlias = true;
                         entityResource.getSafeAlias(encodeURIComponent(value), true).then(function (safeAlias) {
                             if (updateAlias) {
-                              scope.alias = safeAlias.alias;
-                           }
+                                scope.alias = safeAlias.alias;
+                            }
+                            scope.placeholderText = scope.labels.idle;
                       });
                     }, 500);
 
@@ -108,7 +109,6 @@ angular.module("umbraco.directives")
                     scope.alias = "";
                     scope.placeholderText = scope.labels.idle;
                   }
-
                 }
 
                 // if alias gets unlocked - stop watching alias
@@ -119,17 +119,17 @@ angular.module("umbraco.directives")
                 }));
 
                 // validate custom entered alias
-                eventBindings.push(scope.$watch('alias', function(newValue, oldValue){
-
-                  if(scope.alias === "" && bindWatcher === true || scope.alias === null && bindWatcher === true) {
-                    // add watcher
-                    eventBindings.push(scope.$watch('aliasFrom', function(newValue, oldValue) {
-                       if(bindWatcher) {
-                          generateAlias(newValue);
-                       }
-                    }));
-                  }
-
+                eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
+                    if (scope.alias === "" || scope.alias === null || scope.alias === undefined) {
+                        if (bindWatcher === true) {
+                            // add watcher
+                            eventBindings.push(scope.$watch('aliasFrom', function (newValue, oldValue) {
+                                if (bindWatcher) {
+                                    generateAlias(newValue);
+                                }
+                            }));
+                        }
+                    }
                }));
 
                // clean up

From cd6cdcfda468bba4c6d07bf9d9b1886ec072023b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 13 Jan 2019 13:54:30 +0100
Subject: [PATCH 43/84] Visualize image transparency in upload and image
 cropper thumbnails (#4050)

---
 .../src/less/property-editors.less            | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

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 e9d598a8cf..73de7aeee7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -1,3 +1,5 @@
+@checkered-background: url(../img/checkered-background.png);
+
 //
 // Container styles
 // --------------------------------------------------
@@ -386,7 +388,7 @@ div.umb-codeeditor .umb-btn-toolbar {
     max-height:100%;
     margin:auto;
     display:block;
-    background-image: url(../img/checkered-background.png);
+    background-image: @checkered-background;
 }
 
 .umb-sortable-thumbnails li .trashed {
@@ -599,12 +601,18 @@ div.umb-codeeditor .umb-btn-toolbar {
         vertical-align: top;
     }
 
-    .gravity-container .viewport {
-        max-width: 600px;
-    }
+    .gravity-container {
+        border: 1px solid @gray-8;
+        line-height: 0;
 
-    .gravity-container .viewport:hover {
-        cursor: pointer;
+        .viewport {
+            max-width: 600px;
+            background: @checkered-background;
+
+            &:hover {
+                cursor: pointer;
+            }
+        }
     }
 
     .imagecropper {
@@ -617,6 +625,10 @@ div.umb-codeeditor .umb-btn-toolbar {
             float: left;
             max-width: 100%;
         }
+
+        .viewport img {
+            background: @checkered-background;
+        }
     }
 
     .imagecropper .umb-cropper__container {
@@ -884,6 +896,10 @@ div.umb-codeeditor .umb-btn-toolbar {
   list-style: none;
   vertical-align: middle;
   margin-bottom: 0;
+
+  img {
+    background: @checkered-background;
+  }
 }
 
 .umb-fileupload label {

From d1cfe847235198c49ae6640e56a0dc3d50fe35fd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 12 Jan 2019 17:05:52 +0100
Subject: [PATCH 44/84] Set the form dirty when changing focal point and
 editing crops

---
 .../imaging/umbimagegravity.directive.js       | 18 +++++++++---------
 .../imagecropper/imagecropper.controller.js    |  5 +++++
 .../imagecropper/imagecropper.html             |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
index bb364b79ee..7d1b1c5a18 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
@@ -14,7 +14,8 @@ angular.module("umbraco.directives")
 				scope: {
 					src: '=',
 					center: "=",
-                    onImageLoaded: "&"
+                    onImageLoaded: "&",
+                    onGravityChanged: "&"
 				},
 				link: function(scope, element, attrs) {
 
@@ -52,7 +53,7 @@ angular.module("umbraco.directives")
 
 					    calculateGravity(offsetX, offsetY);
 
-					    lazyEndEvent();
+					    gravityChanged();
 					};
 
                     var setDimensions = function () {
@@ -77,12 +78,11 @@ angular.module("umbraco.directives")
 						scope.center.top =  (scope.dimensions.top+10) / scope.dimensions.height;
 					};
 
-					var lazyEndEvent = _.debounce(function(){
-						scope.$apply(function(){
-							scope.$emit("imageFocalPointStop");
-						});
-					}, 2000);
-
+                    var gravityChanged = function () {
+                        if (angular.isFunction(scope.onGravityChanged)) {
+                            scope.onGravityChanged();
+                        }
+                    };
 
 					//Drag and drop positioning, using jquery ui draggable
 					//TODO ensure that the point doesnt go outside the box
@@ -100,7 +100,7 @@ angular.module("umbraco.directives")
 								calculateGravity(offsetX, offsetY);
 							});
 
-							lazyEndEvent();
+							gravityChanged();
 						}
 					});
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index 47442495f7..d9131e88a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -52,6 +52,7 @@ angular.module('umbraco')
             });
             editedCrop.coordinates = $scope.currentCrop.coordinates;
             $scope.close();
+            angularHelper.getCurrentForm($scope).$setDirty();
         };
 
         //reset the current crop
@@ -98,6 +99,10 @@ angular.module('umbraco')
             $scope.hasDimensions = hasDimensions;
         };
 
+        $scope.focalPointChanged = function () {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
+
         //on image selected, update the cropper
         $scope.$on("filesSelected", function (ev, args) {
             $scope.model.value = config;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
index a8f513f006..6e1cb52822 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
@@ -40,7 +40,8 @@
                 <umb-image-gravity
                     src="imageSrc"
                     center="model.value.focalPoint"
-                    on-image-loaded="imageLoaded(isCroppable, hasDimensions)">
+                    on-image-loaded="imageLoaded(isCroppable, hasDimensions)"
+                    on-gravity-changed="focalPointChanged()">
                 </umb-image-gravity>
                 <a href class="btn btn-link btn-crop-delete" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
             </div>

From 0f7cb7c17737632bdd759300de003eb1f3095afe Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 11 Jan 2019 14:36:45 +0100
Subject: [PATCH 45/84] Use built-in localization for Nested Content + fix
 element picker title

---
 .../nestedcontent/nestedcontent.controller.js | 26 +++++--------------
 .../nestedcontent/nestedcontent.html          |  6 ++---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 6e67d2d251..79e00fa453 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -81,25 +81,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 : undefined;
         });
 
-        $scope.editIconTitle = '';
-        $scope.moveIconTitle = '';
-        $scope.deleteIconTitle = '';
-
-        // localize the edit icon title
-        localizationService.localize('general_edit').then(function (value) {
-            $scope.editIconTitle = value;
-        });
-
-        // localize the delete icon title
-        localizationService.localize('general_delete').then(function (value) {
-            $scope.deleteIconTitle = value;
-        });
-
-        // localize the move icon title
-        localizationService.localize('actions_move').then(function (value) {
-            $scope.moveIconTitle = value;
-        });
-
         $scope.nodes = [];
         $scope.currentNode = undefined;
         $scope.realCurrentNode = undefined;
@@ -116,6 +97,11 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.showIcons = $scope.model.config.showIcons || true;
         $scope.wideMode = $scope.model.config.hideLabel == "1";
 
+        $scope.labels = {};
+        localizationService.localizeMany(["grid_insertControl"]).then(function(data) {
+            $scope.labels.docTypePickerTitle = data[0];
+        });
+
         // helper to force the current form into the dirty state
         $scope.setDirty = function () {
             if ($scope.propertyForm) {
@@ -138,7 +124,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             }
 
             $scope.overlayMenu = {
-                title: localizationService.localize('grid_insertControl'),
+                title: $scope.labels.docTypePickerTitle,
                 show: false,
                 style: {},
                 filter: $scope.scaffolds.length > 15 ? true : false,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 1ff6666907..572021aebd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -12,13 +12,13 @@
                     <div class="umb-nested-content__heading" ng-class="{'-with-icon': showIcons}"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>
 
                     <div class="umb-nested-content__icons">
-                        <a class="umb-nested-content__icon umb-nested-content__icon--edit" title="{{editIconTitle}}" ng-class="{ 'umb-nested-content__icon--active' : $parent.realCurrentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" ng-show="$parent.maxItems > 1" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--edit" localize="title" title="general_edit" ng-class="{ 'umb-nested-content__icon--active' : $parent.realCurrentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" ng-show="$parent.maxItems > 1" prevent-default>
                             <i class="icon icon-edit"></i>
                         </a>
-                        <a class="umb-nested-content__icon umb-nested-content__icon--move" title="{{moveIconTitle}}" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--move" localize="title" title="actions_move" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
                             <i class="icon icon-navigation"></i>
                         </a>
-                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" title="{{deleteIconTitle}}" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
                             <i class="icon icon-trash"></i>
                         </a>
                     </div>

From d350ab0789f7d97202bdff299ef32d9acce4b30e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 11 Jan 2019 15:07:04 +0100
Subject: [PATCH 46/84] Ensure some spacing between properties within Nested
 Content items

---
 .../src/less/components/umb-nested-content.less            | 7 +++++++
 .../nestedcontent/nestedcontent.editor.html                | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index df8977a2bf..6ddd9d8d50 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -3,6 +3,13 @@
     position: relative;
 }
 
+.umb-nested-content-property-container {
+    position: relative;
+    &:not(:last-child){
+        margin-bottom: 12px;
+    }
+}
+
 .umb-nested-content--not-supported {
     opacity: 0.3;
     pointer-events: none;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 83076b54a0..0cf67022c6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,5 +1,5 @@
 <div class="umb-pane">
-  <div ng-repeat="property in tab.properties" style="position: relative;">
+  <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
 
     <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
       <umb-property-editor model="property"></umb-property-editor>

From f620d0deca457d3733755a8e6bb71082511fd1f2 Mon Sep 17 00:00:00 2001
From: Steve <steve@honestjohn.co.uk>
Date: Fri, 11 Jan 2019 11:16:46 +0000
Subject: [PATCH 47/84] Fixes #4016 unpublished content styling in list view

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

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 2c1fc4a701..217d94bc00 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
@@ -165,7 +165,7 @@ input.umb-table__input {
 
 }
 
-.-content :not(.with-unpublished-version).-unpublished {
+.-content .-unpublished:not(.with-unpublished-version) {
     .umb-table__name > * {
         opacity: .4;
     }

From b354eda7ac9ed2f3f650ef4c169425f2d39dc1a7 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 8 Jan 2019 00:39:45 +0100
Subject: [PATCH 48/84] Add styles for umb-property-file-upload and move styles
 for umb-upload-big-button

---
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../components/umb-property-file-upload.less  | 28 +++++++++++++++++++
 .../src/less/property-editors.less            | 13 +--------
 .../upload/umb-property-file-upload.html      |  3 +-
 4 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less

diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index a28c128706..a65b94444e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -161,6 +161,7 @@
 @import "components/umb-file-dropzone.less";
 @import "components/umb-node-preview.less";
 @import "components/umb-mini-editor.less";
+@import "components/umb-property-file-upload.less";
 
 @import "components/users/umb-user-cards.less";
 @import "components/users/umb-user-details.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
new file mode 100644
index 0000000000..08b1a1b5e1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
@@ -0,0 +1,28 @@
+.umb-property-file-upload {
+
+    .umb-upload-button-big {
+        display: block;
+        padding: 20px;
+        opacity: 1;
+        border: 1px dashed @gray-8;
+        background: none;
+        text-align: center;
+        font-size: 14px;
+
+        &, &:hover {
+            color: @gray-8;
+        }
+
+        i.icon {
+            font-size: 55px;
+            line-height: 70px
+        }
+
+        input {
+            left: 0;
+            bottom: 0;
+            height: 100%;
+            width: 100%;
+        }
+    }
+}
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 7e3d3f1491..3ec8c383da 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -699,7 +699,7 @@
 //
 // folder-browser
 // --------------------------------------------------
-.umb-folderbrowser .add-link{
+.umb-folderbrowser .add-link {
   display: inline-block;
   height: 120px;
   width: 120px;
@@ -708,17 +708,6 @@
   line-height: 120px
 }
 
-.umb-upload-button-big:hover{color: @gray-8;}
-
-.umb-upload-button-big {display: block}
-.umb-upload-button-big input {
-  left: 0;
-  bottom: 0;
-  height: 100%;
-  width: 100%;
-}
-
-
 //
 // File upload
 // --------------------------------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index f205dffa57..dea532b7ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -1,4 +1,5 @@
-<div>
+<div class="umb-property-file-upload">
+
     <ng-form name="vm.fileUploadForm">
 
         <div class="fileinput-button umb-upload-button-big"

From 168febae248cb80a6c87ca9d0c840b70f97121fc Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 8 Jan 2019 00:40:23 +0100
Subject: [PATCH 49/84] Only show extension if media item has a file

---
 .../src/views/components/umb-media-grid.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index 2591789a36..360c6b2bb7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -24,7 +24,7 @@
             <!-- Icon for files -->
             <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension != 'svg'">
                 <i class="umb-media-grid__item-icon {{item.icon}}"></i>
-                <span>.{{item.extension}}</span>
+                <span ng-if="item.extension">.{{item.extension}}</span>
             </span>
         </div>
     </div>

From 9968cd257d072e049fdc163e6862cbe6da9c7487 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 8 Jan 2019 00:41:26 +0100
Subject: [PATCH 50/84] Rename wrapper class on umb-file-dropzone

---
 .../src/less/components/umb-file-dropzone.less                  | 2 +-
 .../src/views/components/upload/umb-file-dropzone.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 4803c05f6e..b7c58ad3cf 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
@@ -1,5 +1,5 @@
 
-.umb-file-dropzone-directive{
+.umb-file-dropzone {
 
   // drop zone
   // tall and small version - animate height
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index 9d2997625e..c99655b7fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -1,4 +1,4 @@
-<div data-element="dropzone" class="umb-file-dropzone-directive">
+<div data-element="dropzone" class="umb-file-dropzone">
 
 <ng-form name="uploadForm" umb-isolate-form>
 

From 1213551ca951db86acc0fda3f40b0a1d4efad4a5 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 8 Jan 2019 00:40:23 +0100
Subject: [PATCH 51/84] Only show extension if media item has a file

(cherry picked from commit 168febae248cb80a6c87ca9d0c840b70f97121fc)
---
 .../src/views/components/umb-media-grid.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index bad1ccc1ce..e97c91b414 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -23,7 +23,7 @@
             <!-- Icon for files -->
             <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension != 'svg'">
                 <i class="umb-media-grid__item-icon {{item.icon}}"></i>
-                <span>.{{item.extension}}</span>
+                <span ng-if="item.extension">.{{item.extension}}</span>
             </span>
         </div>
     </div>

From 8d1733fd1275ba18f3420e995613bc52e0b51344 Mon Sep 17 00:00:00 2001
From: Jannik Anker <jaa@novicell.dk>
Date: Tue, 2 Oct 2018 18:43:12 +0200
Subject: [PATCH 52/84] Issue 3018 - non-admin users cannot create groups

---
 .../Editors/UserGroupEditorAuthorizationHelper.cs  | 14 +++++++++++++-
 src/Umbraco.Web/Editors/UserGroupsController.cs    | 11 ++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
index 6bc39b376d..5e6458f93a 100644
--- a/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
@@ -53,6 +53,18 @@ namespace Umbraco.Web.Editors
             if (currentUser.IsAdmin())
                 return Attempt<string>.Succeed();
 
+            // var derp = ((userGroupSave.Id == null || (int)userGroupSave.Id <= 0) && Services.SectionService.GetAllowedSections(Security.CurrentUser.Id).Select(x => x.Alias).Contains(Constants.Applications.Users)) ? Attempt<string>.Succeed() : Attempt<string>.Failed();
+
+            var existingGroups = _userService.GetUserGroupsByAlias(groupAliases);
+
+            if(!existingGroups.Any())
+            {
+                // We're dealing with new groups,
+                // so authorization should be given to any user with access to Users section
+                if (currentUser.AllowedSections.Contains(Constants.Applications.Users))
+                    return Attempt<string>.Succeed();
+            }
+
             var userGroups = currentUser.Groups.Select(x => x.Alias).ToArray();
             var missingAccess = groupAliases.Except(userGroups).ToArray();
             return missingAccess.Length == 0
@@ -119,4 +131,4 @@ namespace Umbraco.Web.Editors
             return Attempt<string>.Succeed();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs
index 66011e01b2..7d08560b6f 100644
--- a/src/Umbraco.Web/Editors/UserGroupsController.cs
+++ b/src/Umbraco.Web/Editors/UserGroupsController.cs
@@ -30,6 +30,7 @@ namespace Umbraco.Web.Editors
             //authorize that the user has access to save this user group
             var authHelper = new UserGroupEditorAuthorizationHelper(
                 Services.UserService, Services.ContentService, Services.MediaService, Services.EntityService);
+
             var isAuthorized = authHelper.AuthorizeGroupAccess(Security.CurrentUser, userGroupSave.Alias);
             if (isAuthorized == false)
                 throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.Unauthorized, isAuthorized.Result));
@@ -50,6 +51,14 @@ namespace Umbraco.Web.Editors
             if (isAuthorized == false)
                 throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.Unauthorized, isAuthorized.Result));
 
+            //current user needs to be added to a new group if not an admin (possibly only if no other users are added?) to avoid a 401
+            if(!Security.CurrentUser.IsAdmin() && (userGroupSave.Id == null || Convert.ToInt32(userGroupSave.Id) >= 0)/* && !userGroupSave.Users.Any() */)
+            {
+                var userIds = userGroupSave.Users.ToList();
+                userIds.Add(Security.CurrentUser.Id);
+                userGroupSave.Users = userIds;
+            }
+
             //save the group
             Services.UserService.Save(userGroupSave.PersistedUserGroup, userGroupSave.Users.ToArray());
             
@@ -148,4 +157,4 @@ namespace Umbraco.Web.Editors
                 Services.TextService.Localize("speechBubbles/deleteUserGroupSuccess", new[] {userGroups[0].Name}));
         }
     }
-}
\ No newline at end of file
+}

From 1224f682977d32b0526fa36d0605618b31fdca1f Mon Sep 17 00:00:00 2001
From: Jannik Anker <jaa@novicell.dk>
Date: Tue, 2 Oct 2018 18:45:44 +0200
Subject: [PATCH 53/84] Issue 3018 - non-admin users cannot create groups
 (derpness cleanup)

---
 src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
index 5e6458f93a..1f7601379e 100644
--- a/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/UserGroupEditorAuthorizationHelper.cs
@@ -53,8 +53,6 @@ namespace Umbraco.Web.Editors
             if (currentUser.IsAdmin())
                 return Attempt<string>.Succeed();
 
-            // var derp = ((userGroupSave.Id == null || (int)userGroupSave.Id <= 0) && Services.SectionService.GetAllowedSections(Security.CurrentUser.Id).Select(x => x.Alias).Contains(Constants.Applications.Users)) ? Attempt<string>.Succeed() : Attempt<string>.Failed();
-
             var existingGroups = _userService.GetUserGroupsByAlias(groupAliases);
 
             if(!existingGroups.Any())

From 282ac2b9c5da047cb6b725a74500a18e21890c73 Mon Sep 17 00:00:00 2001
From: christophnz <nzchristoph@gmail.com>
Date: Fri, 14 Dec 2018 22:46:35 +1300
Subject: [PATCH 54/84] Added 2 HtmlHelper extension methods for rendering
 RelatedLinks, including Unit tests

---
 .../Mvc/HtmlHelperExtensionMethodsTests.cs    | 29 +++++++++++++++--
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs | 32 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
index adf5772f76..e7e4f363c1 100644
--- a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
@@ -29,5 +29,30 @@ namespace Umbraco.Tests.Web.Mvc
 			var output = _htmlHelper.Wrap("div", "hello world", new {style = "color:red;", onclick = "void();"});
 			Assert.AreEqual("<div style=\"color:red;\" onclick=\"void();\">hello world</div>", output.ToHtmlString());
 		}
-	}
-}
\ No newline at end of file
+
+        [Test]
+        public void GetRelatedLinkHtml_Simple()
+        {
+            var relatedLink = new Umbraco.Web.Models.RelatedLink {
+                Caption = "Link Caption",
+                NewWindow = true,
+                Link = "https://www.google.com/"
+            };
+            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink);
+            Assert.AreEqual("<a href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
+        }
+
+        [Test]
+        public void GetRelatedLinkHtml_HtmlAttributes()
+        {
+            var relatedLink = new Umbraco.Web.Models.RelatedLink
+            {
+                Caption = "Link Caption",
+                NewWindow = true,
+                Link = "https://www.google.com/"
+            };
+            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink, new { @class = "test-class"});
+            Assert.AreEqual("<a class=\"test-class\" href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
+        }
+    }
+}
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 30b4e64e33..90bc97ca19 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -965,5 +965,37 @@ namespace Umbraco.Web
 
         #endregion
 
+        #region RelatedLink
+
+        /// <summary>
+        /// Renders an anchor element for a RelatedLink instance.
+        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot;&gt;relatedLink.Caption&lt;/a&gt;
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
+        /// <param name="relatedLink">The RelatedLink instance</param>
+        /// <returns>An anchor element </returns>
+        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink)
+        {
+            return htmlHelper.GetRelatedLinkHtml(relatedLink, null);
+        }
+
+        /// <summary>
+        /// Renders an anchor element for a RelatedLink instance, accepting htmlAttributes.
+        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot; htmlAttributes&gt;relatedLink.Caption&lt;/a&gt;
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
+        /// <param name="relatedLink">The RelatedLink instance</param>
+        /// <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
+        /// <returns></returns>
+        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink, object htmlAttributes)
+        {
+            var tagBuilder = new TagBuilder("a");
+            tagBuilder.MergeAttributes(HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
+            tagBuilder.MergeAttribute("href", relatedLink.Link);
+            tagBuilder.MergeAttribute("target", relatedLink.NewWindow ? "_blank" : "_self");
+            tagBuilder.InnerHtml = HttpUtility.HtmlEncode(relatedLink.Caption);
+            return MvcHtmlString.Create(tagBuilder.ToString(TagRenderMode.Normal));
+        }
+        #endregion
     }
 }

From 74986d24f15637093bb1b6662ea4351e40e417fc Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 13 Jan 2019 15:49:37 +0100
Subject: [PATCH 55/84] V8: Add "Move" option for deleted items in the content
 tree (#3931)

---
 .../content/content.restore.controller.js     | 128 +++++++++++++-----
 .../src/views/content/restore.html            | 109 +++++++++++----
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |   4 +-
 .../Umbraco/config/lang/en_us.xml             |   4 +-
 4 files changed, 180 insertions(+), 65 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
index 859e6281c0..24457f6980 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
@@ -1,26 +1,91 @@
 angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController",
-    function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, localizationService) {
+    function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, userService) {
 
         $scope.source = _.clone($scope.currentNode);
 
-		$scope.error = null;
-        $scope.success = false;
+        $scope.error = null;
         $scope.loading = true;
+        $scope.moving = false;
+        $scope.success = false;
+
+	    $scope.dialogTreeApi = {};
+        $scope.searchInfo = {
+            showSearch: false,
+            results: [],
+            selectedSearchResults: []
+        }
+        $scope.treeModel = {
+            hideHeader: false
+        }
+        userService.getCurrentUser().then(function (userData) {
+            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
+        });
+
+        function nodeSelectHandler(args) {
+
+            if (args && args.event) {
+                args.event.preventDefault();
+                args.event.stopPropagation();
+            }
+
+            if ($scope.target) {
+                //un-select if there's a current one selected
+                $scope.target.selected = false;
+            }
+
+            $scope.target = args.node;
+            $scope.target.selected = true;
+
+        }
+
+        function nodeExpandedHandler(args) {
+            // open mini list view for list views
+            if (args.node.metaData.isContainer) {
+                openMiniListView(args.node);
+            }
+        }
+
+        $scope.hideSearch = function () {
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.results = [];
+        }
+
+        // method to select a search result 
+        $scope.selectResult = function (evt, result) {
+            result.selected = result.selected === true ? false : true;
+            nodeSelectHandler(evt, { event: evt, node: result });
+        };
+
+        //callback when there are search results 
+        $scope.onSearchResults = function (results) {
+            $scope.searchInfo.results = results;
+            $scope.searchInfo.showSearch = true;
+        };
+
+        $scope.onTreeInit = function () {
+            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
+            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
+        }	    
+
+        // Mini list view
+        $scope.selectListViewNode = function (node) {
+            node.selected = node.selected === true ? false : true;
+            nodeSelectHandler({}, { node: node });
+        };
+
+        $scope.closeMiniListView = function () {
+            $scope.miniListView = undefined;
+        };
+
+        function openMiniListView(node) {
+            $scope.miniListView = node;
+        }
 
         relationResource.getByChildId($scope.source.id, "relateParentDocumentOnDelete").then(function (data) {
             $scope.loading = false;
 
             if (!data.length) {
-                localizationService.localizeMany(["recycleBin_itemCannotBeRestored", "recycleBin_noRestoreRelation"])
-                    .then(function(values) {
-                        $scope.success = false;
-                        $scope.error = {
-                            errorMsg: values[0],
-                            data: {
-                                Message: values[1]
-                            }
-                        }
-                    });
+                $scope.moving = true;
                 return;
             }
 
@@ -30,40 +95,32 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
 				$scope.target = { id: -1, name: "Root" };
 
             } else {
-			    $scope.loading = true;
+                $scope.loading = true;
+
                 entityResource.getById($scope.relation.parentId, "Document").then(function (data) {
                     $scope.loading = false;
-					$scope.target = data;
-					// make sure the target item isn't in the recycle bin
-					if($scope.target.path.indexOf("-20") !== -1) {
-                        localizationService.localizeMany(["recycleBin_itemCannotBeRestored", "recycleBin_restoreUnderRecycled"])
-					        .then(function (values) {
-					            $scope.success = false;
-					            $scope.error = {
-					                errorMsg: values[0],
-					                data: {
-                                        Message: values[1].replace('%0%', $scope.target.name)
-					                }
-					            }
-					        });
-						$scope.success = false;
-					}
+                    $scope.target = data;
 
+                    // make sure the target item isn't in the recycle bin
+                    if ($scope.target.path.indexOf("-20") !== -1) {
+                        $scope.moving = true;
+                        $scope.target = null;
+                    }
 				}, function (err) {
-					$scope.success = false;
-					$scope.error = err;
                     $scope.loading = false;
+                    $scope.error = err;
 				});
 			}
 
 		}, function (err) {
-			$scope.success = false;
-			$scope.error = err;
+            $scope.loading = false;
+            $scope.error = err;
 		});
 
 		$scope.restore = function () {
 		    $scope.loading = true;
-			// this code was copied from `content.move.controller.js`
+
+		    // this code was copied from `content.move.controller.js`
             contentResource.move({ parentId: $scope.target.id, id: $scope.source.id })
 				.then(function (path) {
 
@@ -88,9 +145,8 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
 					});
 
 				}, function (err) {
-					$scope.success = false;
-					$scope.error = err;
                     $scope.loading = false;
+                    $scope.error = err;
 				});
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/restore.html b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
index 83a69effb6..ead6ed91ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/restore.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
@@ -1,34 +1,93 @@
 <div ng-controller="Umbraco.Editors.Content.RestoreController">
-	<div class="umb-dialog-body">
-		<umb-pane>
+	<div class="umb-dialog-body" ng-cloak>
+        <umb-pane>
+            <umb-load-indicator
+                ng-show="loading">
+            </umb-load-indicator>
 
-		    <umb-load-indicator
-		        ng-show="loading">
-		    </umb-load-indicator>
+            <div ng-show="error">
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.Message}}</div>
+                </div>
+            </div>
 
-		    <p class="abstract" ng-hide="loading || error != null || success">
-                <localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
-            </p>
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{source.name}}</strong>
+                    <span ng-hide="moving"><localize key="recycleBin_wasRestored">was restored under</localize></span>
+                    <span ng-show="moving"><localize key="editdatatype_wasMoved">was moved underneath</localize></span>
+                    <strong>{{target.name}}</strong>
+                </div>
+                <button class="btn btn-primary" ng-click="close()">Ok</button>
+            </div>
 
-		    <div ng-show="error">
-		        <div class="alert alert-error">
-		            <div><strong>{{error.errorMsg}}</strong></div>
-		            <div>{{error.data.Message}}</div>
-		        </div>
-		    </div>
+            <div ng-hide="moving || loading || success">
 
-		    <div ng-show="success">
-		        <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize> <strong>{{target.name}}</strong>
-		        </div>
-		        <button class="btn btn-primary" ng-click="close()"><localize key="general_ok">Ok</localize></button>
-		    </div>
+                <p class="abstract" ng-hide="error || success">
+                    <localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
+                </p>
 
-		</umb-pane>
+            </div>
+
+            <div ng-hide="!moving || loading || success">
+                <div>
+                    <div class="alert alert-info">
+                        <div><strong><localize key="recycleBin_itemCannotBeRestored">Cannot automatically restore this item</localize></strong></div>
+                        <div><localize key="recycleBin_itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</localize></div>
+                    </div>
+                </div>
+
+                <div ng-hide="miniListView">
+                    <umb-tree-search-box 
+                        hide-search-callback="hideSearch"
+                        search-callback="onSearchResults"
+                        show-search="{{searchInfo.showSearch}}"
+                        section="content">
+                    </umb-tree-search-box>
+
+                    <br />
+
+                    <umb-tree-search-results
+                        ng-if="searchInfo.showSearch"
+                        results="searchInfo.results"
+                        select-result-callback="selectResult">
+                    </umb-tree-search-results>
+
+                    <div ng-hide="searchInfo.showSearch">
+                        <umb-tree
+                            section="content"
+                            hideheader="{{treeModel.hideHeader}}"
+                            hideoptions="true"
+                            isdialog="true"
+                            api="dialogTreeApi"
+                            on-init="onTreeInit()"
+                            enablelistviewexpand="true"
+                            enablecheckboxes="true">
+                        </umb-tree>
+                    </div>
+                </div>
+
+                <umb-mini-list-view
+                    ng-if="miniListView"
+                    node="miniListView"
+                    entity-type="Document"
+                    on-select="selectListViewNode(node)"
+                    on-close="closeMiniListView()">
+                </umb-mini-list-view>
+
+            </div>
+
+        </umb-pane>
 	</div>
 
-	<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || success">
-		<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
-		<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
-	</div>
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success">
+        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
+    </div>
+
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success">
+        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button>
+    </div>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 69f106a775..993286f4c6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1968,8 +1968,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
     <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
     <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
-    <key alias="noRestoreRelation">There is no 'restore' relation found for this node. Use the Move menu item to move it manually.</key>
-    <key alias="restoreUnderRecycled">The item you want to restore it under ('%0%') is in the recycle bin. Use the Move menu item to move the item manually.</key>
+    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
+    <key alias="wasRestored">was restored under</key>
   </area>
   <area alias="relationType">
     <key alias="direction">Direction</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 eaa1c6c39e..b15ff24729 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2024,8 +2024,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
     <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
     <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
-    <key alias="noRestoreRelation">There is no 'restore' relation found for this node. Use the Move menu item to move it manually.</key>
-    <key alias="restoreUnderRecycled">The item you want to restore it under ('%0%') is in the recycle bin. Use the Move menu item to move the item manually.</key>
+    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
+    <key alias="wasRestored">was restored under</key>
   </area>
   <area alias="relationType">
     <key alias="direction">Direction</key>

From 3b8a570c3c3356c745aa8a51d5347e0173d4e03b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 13 Jan 2019 15:53:42 +0100
Subject: [PATCH 56/84] V8: Safeguard against invalid culture in UMB_MCULTURE
 cookie (#4051)

---
 .../src/controllers/navigation.controller.js          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index 335fe99e7c..e023c6d23c 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -355,7 +355,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
                 if (!currCulture) {
                     // no culture in the request, let's look for one in the cookie that's set when changing language
                     var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture) {
+                    if (!defaultCulture || !_.find($scope.languages, function (l) {
+                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
+                        })) {
                         // no luck either, look for the default language
                         var defaultLang = _.find($scope.languages, function (l) {
                             return l.isDefault;
@@ -399,9 +401,10 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     $scope.selectLanguage = function (language) {
 
         $location.search("mculture", language.culture);
-        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie max age is one year = 31536000 seconds)
-        // NOTE: $cookies doesn't support max-age, so we need to go the good ol' JS way about setting the cookie
-        document.cookie = "UMB_MCULTURE=" +language.culture + ";path=/;max-age=31536000;";
+        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie lifetime = one year)
+        var expireDate = new Date();
+        expireDate.setDate(expireDate.getDate() + 365);
+        $cookies.put("UMB_MCULTURE", language.culture, {path: "/", expires: expireDate});
 
         // close the language selector
         $scope.page.languageSelectorIsOpen = false;

From be44741bf986c1961fed8ff7119f6e10b1b984fa Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Sun, 13 Jan 2019 15:58:31 +0100
Subject: [PATCH 57/84] Localized parts of the codefile and template resources
 (#3495)

---
 .../src/common/resources/codefile.resource.js   | 17 +++++++++++++----
 .../src/common/resources/template.resource.js   |  7 +++++--
 .../src/views/partialviews/create.html          |  2 +-
 .../src/views/partialviews/delete.controller.js |  6 ++++++
 .../src/views/partialviews/delete.html          |  7 +++++++
 .../src/views/templates/delete.controller.js    |  7 +++++++
 .../src/views/templates/delete.html             |  9 ++++++++-
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml   |  7 +++++++
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml   |  7 +++++++
 .../umbraco/config/lang/en_us.xml               |  7 +++++++
 10 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
index 7cd55b268a..c7bbbe9227 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
@@ -3,7 +3,7 @@
     * @name umbraco.resources.codefileResource
     * @description Loads in data for files that contain code such as js scripts, partial views and partial view macros
     **/
-function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
+function codefileResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {
 
     return {
 
@@ -106,13 +106,16 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          */
         deleteByPath: function (type, virtualpath) {
+
+            var promise = localizationService.localize("codefile_deleteItemFailed", [virtualpath]);
+
             return umbRequestHelper.resourcePromise(
                 $http.post(
                     umbRequestHelper.getApiUrl(
                         "codeFileApiBaseUrl",
                         "Delete",
                         [{ type: type }, { virtualPath: virtualpath}])),
-                "Failed to delete item: " + virtualpath);
+                promise);
         },
 
         /**
@@ -236,13 +239,19 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          */
 
-        createContainer: function(type, parentId, name) {
+        createContainer: function (type, parentId, name) {
+
+            // Is the parent ID numeric?
+            var key = "codefile_createFolderFailedBy" + (isNaN(parseInt(parentId)) ? "Name" : "Id");
+
+            var promise = localizationService.localize(key, [parentId]);
+
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl(
                     "codeFileApiBaseUrl", 
                     "PostCreateContainer", 
                     { type: type, parentId: parentId, name: encodeURIComponent(name) })),
-                'Failed to create a folder under parent id ' + parentId);
+                promise);
         }
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js
index f969864ba1..377bb415fc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js
@@ -3,7 +3,7 @@
     * @name umbraco.resources.templateResource
     * @description Loads in data for templates
     **/
-function templateResource($q, $http, umbDataFormatter, umbRequestHelper) {
+function templateResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {
 
     return {
 
@@ -152,13 +152,16 @@ function templateResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          */
         deleteById: function(id) {
+
+            var promise = localizationService.localize("template_deleteByIdFailed", [id]);
+
             return umbRequestHelper.resourcePromise(
                 $http.post(
                     umbRequestHelper.getApiUrl(
                         "templateApiBaseUrl",
                         "DeleteById",
                         [{ id: id }])),
-                "Failed to delete item " + id);
+                promise);
         },
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 4d15ab6c01..5cd739adf5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -57,7 +57,7 @@
                     </div>
                 </div>
 
-                <umb-control-group label="Enter a folder name" hide-label="false">
+                <umb-control-group label="@create_enterFolderName" localize="label" hide-label="false">
                     <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
                 </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
index b25ac3c7b8..1e615ad0d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
@@ -12,6 +12,9 @@ function PartialViewsDeleteController($scope, codefileResource, treeService, nav
 
         //mark it for deletion (used in the UI)
         $scope.currentNode.loading = true;
+
+        // Reset the error message
+        $scope.error = null;
         
         codefileResource.deleteByPath('partialViews', $scope.currentNode.id)
             .then(function() {
@@ -21,6 +24,9 @@ function PartialViewsDeleteController($scope, codefileResource, treeService, nav
                 //TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
+            }, function (err) {
+                $scope.currentNode.loading = false;
+                $scope.error = err;
             });
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
index 0f75e8514e..c0fdf2c77f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
@@ -1,6 +1,13 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.PartialViews.DeleteController">
     <div class="umb-dialog-body">
 
+        <div ng-show="error">
+            <div class="alert alert-error">
+                <div><strong>{{error.errorMsg}}</strong></div>
+                <div>{{error.data.message}}</div>
+            </div>
+        </div>
+
         <p class="umb-abstract">
         	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
         </p>
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
index 8995cb1a31..d019a44a10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
@@ -12,6 +12,10 @@ function TemplatesDeleteController($scope, templateResource , treeService, navig
 
         //mark it for deletion (used in the UI)
         $scope.currentNode.loading = true;
+
+        // Reset the error message
+        $scope.error = null;
+
         templateResource.deleteById($scope.currentNode.id).then(function () {
             $scope.currentNode.loading = false;
 
@@ -21,6 +25,9 @@ function TemplatesDeleteController($scope, templateResource , treeService, navig
             //TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
+        }, function (err) {
+            $scope.currentNode.loading = false;
+            $scope.error = err;
         });
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html b/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
index 34648aa43e..c98677f764 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
@@ -1,11 +1,18 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Templates.DeleteController">
     <div class="umb-dialog-body">
 
+        <div ng-show="error">
+            <div class="alert alert-error">
+                <div><strong>{{error.errorMsg}}</strong></div>
+                <div>{{error.data.message}}</div>
+            </div>
+        </div>
+
         <p class="umb-abstract">
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong> ?
         </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
+        <umb-confirm on-confirm="performDelete" on-cancel="cancel">
         </umb-confirm>
 
     </div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 658dd091f6..b4ab08422e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -182,6 +182,11 @@
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Overførsel af egenskaber kunne ikke fuldføres, da en eller flere egenskaber er indstillet til at blive overført mere end én gang.</key>
     <key alias="validDocTypesNote">Kun andre dokumenttyper, der er gyldige på denne placering, vises.</key>
   </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Oprettelse af mappen under parent med ID %0% fejlede</key>
+    <key alias="createFolderFailedByName">Oprettelse af mappen under parent med navnet %0% fejlede</key>
+      <key alias="deleteItemFailed">Sletning af filen/mappen fejlede: %0%</key>
+  </area>
   <area alias="content">
     <key alias="isPublished" version="7.2">Udgivet</key>
     <key alias="about">Om siden</key>
@@ -282,6 +287,7 @@
     <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
     <key alias="createUnder">Opret under</key>
     <key alias="createContentBlueprint">Vælg den dokumenttype, du vil oprette en indholdsskabelon til</key>
+    <key alias="enterFolderName">Angiv et navn for mappen</key>
     <key alias="updateData">Vælg en type og skriv en titel</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
@@ -1158,6 +1164,7 @@ Mange hilsner fra Umbraco robotten
   </area>
 
   <area alias="template">
+    <key alias="deleteByIdFailed">Sletning af skabelonen med ID %0% fejlede</key>
     <key alias="edittemplate">Rediger skabelon</key>
 
     <key alias="insertSections">Sektioner</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index cd5f32da0d..7d3bfa7c99 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -188,6 +188,11 @@
         <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
         <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
     </area>
+    <area alias="codefile">
+        <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
+        <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+        <key alias="deleteItemFailed">Failed to delete item: %0%</key>
+    </area>
     <area alias="content">
         <key alias="isPublished" version="7.2">Is Published</key>
         <key alias="about">About this page</key>
@@ -290,6 +295,7 @@
         <key alias="chooseNode">Where do you want to create the new %0%</key>
         <key alias="createUnder">Create an item under</key>
         <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+        <key alias="enterFolderName">Enter a folder name</key>
         <key alias="updateData">Choose a type and a title</key>
         <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
         <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
@@ -1483,6 +1489,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     </area>
 
     <area alias="template">
+        <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
         <key alias="edittemplate">Edit template</key>
 
         <key alias="insertSections">Sections</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 88b736a34f..0a1756038f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -189,6 +189,11 @@
         <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
         <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
     </area>
+    <area alias="codefile">
+        <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
+        <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+        <key alias="deleteItemFailed">Failed to delete item: %0%</key>
+    </area>
     <area alias="content">
         <key alias="isPublished" version="7.2">Is Published</key>
         <key alias="about">About this page</key>
@@ -292,6 +297,7 @@
         <key alias="chooseNode">Where do you want to create the new %0%</key>
         <key alias="createUnder">Create an item under</key>
         <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+        <key alias="enterFolderName">Enter a folder name</key>
         <key alias="updateData">Choose a type and a title</key>
         <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
         <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
@@ -1481,6 +1487,7 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="styles">Styles</key>
     </area>
     <area alias="template">
+        <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
         <key alias="edittemplate">Edit template</key>
 
         <key alias="insertSections">Sections</key>

From 941baf09cefe0cf32aae027c17f820f68e1390b9 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 13 Jan 2019 16:17:44 +0100
Subject: [PATCH 58/84] Fix linkpicker overlay issues (#3718)

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

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 7b890edbf4..fcce34621b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -25,30 +25,31 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 		$scope.showTarget = $scope.model.hideTarget !== true;
 
 		if (dialogOptions.currentTarget) {
-			$scope.model.target = dialogOptions.currentTarget;
+			// clone the current target so we don't accidentally update the caller's model while manipulating $scope.model.target
+			$scope.model.target = angular.copy(dialogOptions.currentTarget);
 			//if we have a node ID, we fetch the current node to build the form data
 			if ($scope.model.target.id || $scope.model.target.udi) {
 
 				//will be either a udi or an int
 				var id = $scope.model.target.udi ? $scope.model.target.udi : $scope.model.target.id;
 
-				if (!$scope.model.target.path) {
+				// is it a content link?
+			    if (!$scope.model.target.isMedia) {
+			        // get the content path
+			        entityResource.getPath(id, "Document").then(function(path) {
+			            //now sync the tree to this path
+			            $scope.dialogTreeEventHandler.syncTree({
+			                path: path,
+			                tree: "content"
+			            });
+			        });
 
-					entityResource.getPath(id, "Document").then(function (path) {
-						$scope.model.target.path = path;
-						//now sync the tree to this path
-						$scope.dialogTreeEventHandler.syncTree({
-							path: $scope.model.target.path,
-							tree: "content"
-						});
-					});
-				}
-
-				// if a link exists, get the properties to build the anchor name list
-				contentResource.getById(id).then(function (resp) {
-					$scope.model.target.url = resp.urls[0];
-					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-				});
+			        // get the content properties to build the anchor name list
+			        contentResource.getById(id).then(function (resp) {
+			            $scope.model.target.url = resp.urls[0];
+			            $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+			        });
+			    }
 			} else if ($scope.model.target.url.length) {
 			    // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
                 // only do the substring if there's a # or a ?
@@ -122,6 +123,12 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 
 						$scope.mediaPickerOverlay.show = false;
 						$scope.mediaPickerOverlay = null;
+
+						// make sure the content tree has nothing highlighted 
+						$scope.dialogTreeEventHandler.syncTree({
+							path: "-1",
+							tree: "content"
+						});
 					}
 				};
 			});

From 92c278c593353aaa4af3011f68242734cc4e66b4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 14 Jan 2019 07:12:21 +0100
Subject: [PATCH 59/84] Adds missing translation, fixes #4054

---
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml    | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 02b10fe22f..386d3af518 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1254,6 +1254,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="contentTypeUses">This Content Type uses</key>
     <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
+    <key alias="createMatchingTemplate">Create matching template</key>
     <key alias="addIcon">Add icon</key>
   </area>
   <area alias="sort">
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 83d6b9224b..5de373f571 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1278,6 +1278,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="contentTypeUses">This Content Type uses</key>
     <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
+    <key alias="createMatchingTemplate">Create matching template</key>
     <key alias="addIcon">Add icon</key>
   </area>
   <area alias="sort">

From eb6b172be26e30ef5a3b4808e0ca4d3216978d51 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 11 Jan 2019 16:24:16 +0100
Subject: [PATCH 60/84] Cleanup

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 3aa33f0e2f..0647e1c806 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Web.Hosting;
 using CSharpTest.Net.Collections;
 using Newtonsoft.Json;
 using Umbraco.Core;
@@ -15,7 +14,6 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
@@ -26,7 +24,6 @@ using Umbraco.Core.Services.Implement;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Install;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.PublishedCache.NuCache

From c17ee34edb380229b55a8bd812d88517b921e5a8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 11 Jan 2019 16:34:58 +0100
Subject: [PATCH 61/84] Support enlisting in exiting scope contexts (why not?)

---
 src/Umbraco.Core/Scoping/ScopeContext.cs | 30 +++++++++++++-----------
 src/Umbraco.Tests/Scoping/ScopeTests.cs  | 16 ++++---------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContext.cs b/src/Umbraco.Core/Scoping/ScopeContext.cs
index dd26fda85e..4ba1999474 100644
--- a/src/Umbraco.Core/Scoping/ScopeContext.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContext.cs
@@ -7,27 +7,32 @@ namespace Umbraco.Core.Scoping
     internal class ScopeContext : IScopeContext, IInstanceIdentifiable
     {
         private Dictionary<string, IEnlistedObject> _enlisted;
-        private bool _exiting;
 
         public void ScopeExit(bool completed)
         {
             if (_enlisted == null)
                 return;
 
-            _exiting = true;
+            // fixme - can we create infinite loops?
+            // fixme - what about nested events? will they just be plainly ignored = really bad?
 
             List<Exception> exceptions = null;
-            foreach (var enlisted in _enlisted.Values.OrderBy(x => x.Priority))
+            List<IEnlistedObject> orderedEnlisted;
+            while ((orderedEnlisted = _enlisted.Values.OrderBy(x => x.Priority).ToList()).Count > 0)
             {
-                try
+                _enlisted.Clear();
+                foreach (var enlisted in orderedEnlisted)
                 {
-                    enlisted.Execute(completed);
-                }
-                catch (Exception e)
-                {
-                    if (exceptions == null)
-                        exceptions = new List<Exception>();
-                    exceptions.Add(e);
+                    try
+                    {
+                        enlisted.Execute(completed);
+                    }
+                    catch (Exception e)
+                    {
+                        if (exceptions == null)
+                            exceptions = new List<Exception>();
+                        exceptions.Add(e);
+                    }
                 }
             }
 
@@ -74,9 +79,6 @@ namespace Umbraco.Core.Scoping
 
         public T Enlist<T>(string key, Func<T> creator, Action<bool, T> action = null, int priority = 100)
         {
-            if (_exiting)
-                throw new InvalidOperationException("Cannot enlist now, context is exiting.");
-
             var enlistedObjects = _enlisted ?? (_enlisted = new Dictionary<string, IEnlistedObject>());
 
             if (enlistedObjects.TryGetValue(key, out var enlisted))
diff --git a/src/Umbraco.Tests/Scoping/ScopeTests.cs b/src/Umbraco.Tests/Scoping/ScopeTests.cs
index 3f2740291b..6c5e9a74b5 100644
--- a/src/Umbraco.Tests/Scoping/ScopeTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeTests.cs
@@ -540,7 +540,7 @@ namespace Umbraco.Tests.Scoping
             var scopeProvider = ScopeProvider;
 
             bool? completed = null;
-            Exception exception = null;
+            bool? completed2 = null;
 
             Assert.IsNull(scopeProvider.AmbientScope);
             using (var scope = scopeProvider.CreateScope())
@@ -551,15 +551,7 @@ namespace Umbraco.Tests.Scoping
 
                     // at that point the scope is gone, but the context is still there
                     var ambientContext = scopeProvider.AmbientContext;
-
-                    try
-                    {
-                        ambientContext.Enlist("another", c2 => { });
-                    }
-                    catch (Exception e)
-                    {
-                        exception = e;
-                    }
+                    ambientContext.Enlist("another", c2 => { completed2 = c2; });
                 });
                 if (complete)
                     scope.Complete();
@@ -567,8 +559,8 @@ namespace Umbraco.Tests.Scoping
             Assert.IsNull(scopeProvider.AmbientScope);
             Assert.IsNull(scopeProvider.AmbientContext);
             Assert.IsNotNull(completed);
-            Assert.IsNotNull(exception);
-            Assert.IsInstanceOf<InvalidOperationException>(exception);
+            Assert.AreEqual(complete,completed.Value);
+            Assert.AreEqual(complete, completed2.Value);
         }
 
         [Test]

From 05fbf6c38a91cbc0e611c510b1d785b888f11c99 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 08:05:37 +0100
Subject: [PATCH 62/84] Fix DistributedCacheBinder ContentService.TreeChanged
 event

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

diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
index 81b133b9ef..d522e54de6 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
@@ -142,8 +142,8 @@ namespace Umbraco.Web.Cache
                 () => ContentService.Saved -= ContentService_Saved);
             Bind(() => ContentService.Copied += ContentService_Copied, // needed for permissions
                 () => ContentService.Copied -= ContentService_Copied);
-            Bind(() => ContentService.TreeChanged += ContentService_Changed,// handles all content changes
-                () => ContentService.TreeChanged -= ContentService_Changed);
+            Bind(() => ContentService.TreeChanged += ContentService_TreeChanged,// handles all content changes
+                () => ContentService.TreeChanged -= ContentService_TreeChanged);
 
             // TreeChanged should also deal with this
             //Bind(() => ContentService.SavedBlueprint += ContentService_SavedBlueprint,
@@ -206,7 +206,7 @@ namespace Umbraco.Web.Cache
         {
         }
 
-        private void ContentService_Changed(IContentService sender, TreeChange<IContent>.EventArgs args)
+        private void ContentService_TreeChanged(IContentService sender, TreeChange<IContent>.EventArgs args)
         {
             _distributedCache.RefreshContentCache(args.Changes.ToArray());
         }

From 561b359a721ef002e98c2beb48d374ad683736e1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 08:53:04 +0100
Subject: [PATCH 63/84] Name change

---
 .../{TargetedServiceProvider.cs => TargetedServiceFactory.cs} | 4 ++--
 src/Umbraco.Core/IO/SupportingFileSystems.cs                  | 4 ++--
 src/Umbraco.Core/Umbraco.Core.csproj                          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Umbraco.Core/Composing/{TargetedServiceProvider.cs => TargetedServiceFactory.cs} (76%)

diff --git a/src/Umbraco.Core/Composing/TargetedServiceProvider.cs b/src/Umbraco.Core/Composing/TargetedServiceFactory.cs
similarity index 76%
rename from src/Umbraco.Core/Composing/TargetedServiceProvider.cs
rename to src/Umbraco.Core/Composing/TargetedServiceFactory.cs
index 3f88e1bc28..53022c0043 100644
--- a/src/Umbraco.Core/Composing/TargetedServiceProvider.cs
+++ b/src/Umbraco.Core/Composing/TargetedServiceFactory.cs
@@ -4,11 +4,11 @@
     /// Provides a base class for targeted service factories.
     /// </summary>
     /// <typeparam name="TService"></typeparam>
-    public abstract class TargetedServiceProvider<TService>
+    public abstract class TargetedServiceFactory<TService>
     {
         private readonly IFactory _factory;
 
-        protected TargetedServiceProvider(IFactory factory)
+        protected TargetedServiceFactory(IFactory factory)
         {
             _factory = factory;
         }
diff --git a/src/Umbraco.Core/IO/SupportingFileSystems.cs b/src/Umbraco.Core/IO/SupportingFileSystems.cs
index c13ae203ee..43ac2ba85a 100644
--- a/src/Umbraco.Core/IO/SupportingFileSystems.cs
+++ b/src/Umbraco.Core/IO/SupportingFileSystems.cs
@@ -2,10 +2,10 @@
 
 namespace Umbraco.Core.IO
 {
-    public class SupportingFileSystems : TargetedServiceProvider<IFileSystem>
+    public class SupportingFileSystems : TargetedServiceFactory<IFileSystem>
     {
         public SupportingFileSystems(IFactory factory)
             : base(factory)
         { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a592fd0f0e..609befd233 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -196,7 +196,7 @@
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
     <Compile Include="Composing\OrderedCollectionBuilderBase.cs" />
-    <Compile Include="Composing\TargetedServiceProvider.cs" />
+    <Compile Include="Composing\TargetedServiceFactory.cs" />
     <Compile Include="Composing\TypeFinder.cs" />
     <Compile Include="Composing\TypeHelper.cs" />
     <Compile Include="Composing\TypeLoader.cs" />

From a68b19f1ee2bbd58975a14a91533b5c7f5c9daf9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 14:28:19 +0100
Subject: [PATCH 64/84] More composition / filesystems fixes

---
 src/Umbraco.Core/Components/Composition.cs    | 94 +++++++++++--------
 .../Composing/CompositionExtensions.cs        |  2 +-
 src/Umbraco.Core/Composing/IFactory.cs        |  7 --
 src/Umbraco.Core/Composing/IRegister.cs       | 45 ++++-----
 .../LightInject/LightInjectContainer.cs       | 65 +++++--------
 .../MixedLightInjectScopeManagerProvider.cs   |  3 +
 .../Composing/RegisterExtensions.cs           |  6 +-
 src/Umbraco.Core/Configuration/Configs.cs     |  2 +-
 .../Composing/ContainerConformingTests.cs     |  8 +-
 9 files changed, 115 insertions(+), 117 deletions(-)

diff --git a/src/Umbraco.Core/Components/Composition.cs b/src/Umbraco.Core/Components/Composition.cs
index 6cd8c8e5f0..6df86d793f 100644
--- a/src/Umbraco.Core/Components/Composition.cs
+++ b/src/Umbraco.Core/Components/Composition.cs
@@ -81,29 +81,34 @@ namespace Umbraco.Core.Components
         public void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient)
             => _register.Register(serviceType, implementingType, lifetime);
 
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => _register.RegisterFor<TService, TTarget>(implementingType, lifetime);
-
         /// <inheritdoc />
         public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class
             => _register.Register(factory, lifetime);
 
+        /// <inheritdoc />
+        public void Register(Type serviceType, object instance)
+            => _register.Register(serviceType, instance);
+
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => _register.RegisterFor<TService, TTarget>(lifetime);
+
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => _register.RegisterFor<TService, TTarget>(implementingType, lifetime);
+
         /// <inheritdoc />
         public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class
             => _register.RegisterFor<TService, TTarget>(factory, lifetime);
 
         /// <inheritdoc />
-        public void RegisterInstance(Type serviceType, object instance)
-            => _register.RegisterInstance(serviceType, instance);
-
-        /// <inheritdoc />
-        public void RegisterInstanceFor<TService, TTarget>(TService instance)
+        public void RegisterFor<TService, TTarget>(TService instance)
             where TService : class
-            => _register.RegisterInstanceFor<TService, TTarget>(instance);
+            => _register.RegisterFor<TService, TTarget>(instance);
 
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
@@ -154,37 +159,21 @@ namespace Umbraco.Core.Components
             => serviceType.FullName + "::" + targetType.FullName;
 
         /// <summary>
-        /// Registers a unique service.
+        /// Registers a unique service as its own implementation.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUnique(Type serviceType)
+            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, Lifetime.Singleton);
+
+        /// <summary>
+        /// Registers a unique service with an implementation type.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUnique(Type serviceType, Type implementingType)
             => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, implementingType, Lifetime.Singleton);
 
         /// <summary>
-        /// Registers a unique service, for a target.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueFor<TService, TTarget>(Type implementingType)
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(implementingType, Lifetime.Singleton);
-
-        /// <summary>
-        /// Registers a unique service.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueInstance(Type serviceType, object instance)
-            => _uniques[GetUniqueName(serviceType)] = register => register.RegisterInstance(serviceType, instance);
-
-        /// <summary>
-        /// Registers a unique service, for a target.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueInstanceFor<TService, TTarget>(TService instance)
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterInstanceFor<TService, TTarget>(instance);
-
-        /// <summary>
-        /// Registers a unique service.
+        /// Registers a unique service with an implementation factory.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUnique<TService>(Func<IFactory, TService> factory)
@@ -192,13 +181,44 @@ namespace Umbraco.Core.Components
             => _uniques[GetUniqueName<TService>()] = register => register.Register<TService>(factory, Lifetime.Singleton);
 
         /// <summary>
-        /// Registers a unique service, for a target.
+        /// Registers a unique service with an implementing instance.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUnique(Type serviceType, object instance)
+            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, instance);
+
+        /// <summary>
+        /// Registers a unique service for a target, as its own implementation.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueFor<TService, TTarget>()
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(Lifetime.Singleton);
+
+        /// <summary>
+        /// Registers a unique service for a target, with an implementing type.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueFor<TService, TTarget>(Type implementingType)
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(implementingType, Lifetime.Singleton);
+
+        /// <summary>
+        /// Registers a unique service for a target, with an implementation factory.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUniqueFor<TService, TTarget>(Func<IFactory, TService> factory)
             where TService : class
             => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(factory, Lifetime.Singleton);
 
+        /// <summary>
+        /// Registers a unique service for a target, with an implementing instance.
+        /// </summary>
+        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
+        public void RegisterUniqueFor<TService, TTarget>(TService instance)
+            where TService : class
+            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(instance);
+
         #endregion
 
         #region Collection Builders
diff --git a/src/Umbraco.Core/Composing/CompositionExtensions.cs b/src/Umbraco.Core/Composing/CompositionExtensions.cs
index ac9a5d6409..2307d757c9 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Core.Composing
         /// Registers a unique service with an implementing instance.
         /// </summary>
         public static void RegisterUnique<TService>(this Composition composition, TService instance)
-            => composition.RegisterUniqueInstance(typeof(TService), instance);
+            => composition.RegisterUnique(typeof(TService), instance);
 
         #endregion
     }
diff --git a/src/Umbraco.Core/Composing/IFactory.cs b/src/Umbraco.Core/Composing/IFactory.cs
index 20fbe33737..768b9207a3 100644
--- a/src/Umbraco.Core/Composing/IFactory.cs
+++ b/src/Umbraco.Core/Composing/IFactory.cs
@@ -3,13 +3,6 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Composing
 {
-    // Implementing:
-    //
-    // The factory
-    // - always picks the constructor with the most parameters
-    // - supports Lazy parameters (and prefers them over non-Lazy) in constructors
-    // - what happens with 'releasing' is unclear
-
     /// <summary>
     /// Defines a service factory for Umbraco.
     /// </summary>
diff --git a/src/Umbraco.Core/Composing/IRegister.cs b/src/Umbraco.Core/Composing/IRegister.cs
index d145df8790..3e6aed67ee 100644
--- a/src/Umbraco.Core/Composing/IRegister.cs
+++ b/src/Umbraco.Core/Composing/IRegister.cs
@@ -2,17 +2,6 @@
 
 namespace Umbraco.Core.Composing
 {
-    // Implementing:
-    //
-    // The register
-    // - supports registering a service, even after some instances of other services have been created
-    // - supports re-registering a service, as long as no instance of that service has been created
-    // - throws when re-registering a service, and an instance of that service has been created
-    //
-    // - registers only one implementation of a nameless service, re-registering replaces the previous
-    //   registration - names are required to register multiple implementations - and getting an
-    //   IEnumerable of the service, nameless, returns them all
-
     /// <summary>
     /// Defines a service register for Umbraco.
     /// </summary>
@@ -33,12 +22,6 @@ namespace Umbraco.Core.Composing
         /// </summary>
         void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient);
 
-        /// <summary>
-        /// Registers a service with an implementation type, for a target.
-        /// </summary>
-        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
         /// <summary>
         /// Registers a service with an implementation factory.
         /// </summary>
@@ -46,20 +29,32 @@ namespace Umbraco.Core.Composing
             where TService : class;
 
         /// <summary>
-        /// Registers a service with an implementation factory, for a target.
+        /// Registers a service with an implementing instance.
+        /// </summary>
+        void Register(Type serviceType, object instance);
+
+        /// <summary>
+        /// Registers a service for a target, as its own implementation.
+        /// </summary>
+        void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
+            where TService : class;
+
+        /// <summary>
+        /// Registers a service for a target, with an implementation type.
+        /// </summary>
+        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class;
+
+        /// <summary>
+        /// Registers a service for a target, with an implementation factory.
         /// </summary>
         void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class;
 
         /// <summary>
-        /// Registers a service with an implementing instance.
+        /// Registers a service for a target, with an implementing instance.
         /// </summary>
-        void RegisterInstance(Type serviceType, object instance);
-
-        /// <summary>
-        /// Registers a service with an implementing instance, for a target.
-        /// </summary>
-        void RegisterInstanceFor<TService, TTarget>(TService instance)
+        void RegisterFor<TService, TTarget>(TService instance)
             where TService : class;
 
         /// <summary>
diff --git a/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs b/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
index 4ccc0ba838..d8a554ee8c 100644
--- a/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
+++ b/src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs
@@ -145,9 +145,7 @@ namespace Umbraco.Core.Composing.LightInject
 
         /// <inheritdoc />
         public void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient)
-        {
-            Container.Register(serviceType, GetLifetime(lifetime));
-        }
+            => Container.Register(serviceType, GetLifetime(lifetime));
 
         /// <inheritdoc />
         public void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient)
@@ -167,13 +165,6 @@ namespace Umbraco.Core.Composing.LightInject
             }
         }
 
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-        {
-            Container.Register(typeof(TService), implementingType, GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
-        }
-
         /// <inheritdoc />
         public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class
@@ -181,13 +172,36 @@ namespace Umbraco.Core.Composing.LightInject
             Container.Register(f => factory(this), GetLifetime(lifetime));
         }
 
+        /// <inheritdoc />
+        public void Register(Type serviceType, object instance)
+            => Container.RegisterInstance(serviceType, instance);
+
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+            => RegisterFor<TService, TTarget>(typeof(TService), lifetime);
+
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
+            where TService : class
+        {
+            // note that there can only be one implementation or instance registered "for" a service
+            Container.Register(typeof(TService), implementingType, GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
+        }
+
         /// <inheritdoc />
         public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class
         {
+            // note that there can only be one implementation or instance registered "for" a service
             Container.Register(f => factory(this), GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
         }
 
+        /// <inheritdoc />
+        public void RegisterFor<TService, TTarget>(TService instance)
+            where TService : class
+            => Container.RegisterInstance(typeof(TService), instance, GetTargetedServiceName<TTarget>());
+
         private ILifetime GetLifetime(Lifetime lifetime)
         {
             switch (lifetime)
@@ -205,15 +219,6 @@ namespace Umbraco.Core.Composing.LightInject
             }
         }
 
-        /// <inheritdoc />
-        public void RegisterInstance(Type serviceType, object instance)
-            => Container.RegisterInstance(serviceType, instance);
-
-        /// <inheritdoc />
-        public void RegisterInstanceFor<TService, TTarget>(TService instance)
-            where TService : class
-            => Container.RegisterInstance(typeof(TService), instance, GetTargetedServiceName<TTarget>());
-
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
         {
@@ -226,17 +231,6 @@ namespace Umbraco.Core.Composing.LightInject
             }, null);
         }
 
-        // was the Light-Inject specific way of dealing with args, but we've replaced it with our own
-        // beware! does NOT work on singletons, see https://github.com/seesharper/LightInject/issues/294
-        //
-        ///// <inheritdoc />
-        //public void RegisterConstructorDependency<TDependency>(Func<IContainer, ParameterInfo, TDependency> factory)
-        //    => Container.RegisterConstructorDependency((f, x) => factory(this, x));
-        //
-        ///// <inheritdoc />
-        //public void RegisterConstructorDependency<TDependency>(Func<IContainer, ParameterInfo, object[], TDependency> factory)
-        //    => Container.RegisterConstructorDependency((f, x, a) => factory(this, x, a));
-
         #endregion
 
         #region Control
@@ -259,21 +253,14 @@ namespace Umbraco.Core.Composing.LightInject
 
         private class AssemblyScanner : IAssemblyScanner
         {
-            //private readonly IAssemblyScanner _scanner;
-
-            //public AssemblyScanner(IAssemblyScanner scanner)
-            //{
-            //    _scanner = scanner;
-            //}
-
             public void Scan(Assembly assembly, IServiceRegistry serviceRegistry, Func<ILifetime> lifetime, Func<Type, Type, bool> shouldRegister, Func<Type, Type, string> serviceNameProvider)
             {
-                // nothing - we *could* scan non-Umbraco assemblies, though
+                // nothing - we don't want LightInject to scan
             }
 
             public void Scan(Assembly assembly, IServiceRegistry serviceRegistry)
             {
-                // nothing - we *could* scan non-Umbraco assemblies, though
+                // nothing - we don't want LightInject to scan
             }
         }
 
diff --git a/src/Umbraco.Core/Composing/LightInject/MixedLightInjectScopeManagerProvider.cs b/src/Umbraco.Core/Composing/LightInject/MixedLightInjectScopeManagerProvider.cs
index 470079c6c0..897c58dd43 100644
--- a/src/Umbraco.Core/Composing/LightInject/MixedLightInjectScopeManagerProvider.cs
+++ b/src/Umbraco.Core/Composing/LightInject/MixedLightInjectScopeManagerProvider.cs
@@ -13,6 +13,9 @@ namespace Umbraco.Core.Composing.LightInject
     // of PerWebRequestScopeManagerProvider - but all delegates see is the mixed one - and therefore
     // they can transition without issues.
     //
+    // The PerWebRequestScopeManager maintains the scope in HttpContext and LightInject registers a
+    // module (PreApplicationStartMethod) which disposes it on EndRequest
+    //
     // the mixed provider is installed in container.ConfigureUmbracoCore() and then,
     // when doing eg container.EnableMvc() or anything that does container.EnablePerWebRequestScope()
     // we need to take great care to preserve the mixed scope manager provider!
diff --git a/src/Umbraco.Core/Composing/RegisterExtensions.cs b/src/Umbraco.Core/Composing/RegisterExtensions.cs
index 9afa41e4b3..d1eacc0c0f 100644
--- a/src/Umbraco.Core/Composing/RegisterExtensions.cs
+++ b/src/Umbraco.Core/Composing/RegisterExtensions.cs
@@ -14,7 +14,7 @@
         /// <summary>
         /// Registers a service with an implementation type, for a target.
         /// </summary>
-        public static void RegisterFor<TService, TTarget, TImplementing>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
+        public static void RegisterFor<TService, TImplementing, TTarget>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
             where TService : class
             => register.RegisterFor<TService, TTarget>(typeof(TImplementing), lifetime);
 
@@ -28,9 +28,9 @@
         /// <summary>
         /// Registers a service with an implementing instance.
         /// </summary>
-        public static void RegisterInstance<TService>(this IRegister register, TService instance)
+        public static void Register<TService>(this IRegister register, TService instance)
             where TService : class
-            => register.RegisterInstance(typeof(TService), instance);
+            => register.Register(typeof(TService), instance);
 
         /// <summary>
         /// Registers a base type for auto-registration.
diff --git a/src/Umbraco.Core/Configuration/Configs.cs b/src/Umbraco.Core/Configuration/Configs.cs
index 3dbbe5d4ff..51e1a327a0 100644
--- a/src/Umbraco.Core/Configuration/Configs.cs
+++ b/src/Umbraco.Core/Configuration/Configs.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Configuration
             if (_registerings == null)
                 throw new InvalidOperationException("Configurations have already been registered.");
 
-            register.RegisterInstance(this);
+            register.Register(this);
 
             foreach (var registering in _registerings.Values)
                 registering(register);
diff --git a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
index 9585c98cb2..21ea961636 100644
--- a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
+++ b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
@@ -194,8 +194,8 @@ namespace Umbraco.Tests.Composing
             var register = GetRegister();
 
             // define two instances
-            register.RegisterInstance(typeof(Thing1), new Thing1());
-            register.RegisterInstance(typeof(Thing1), new Thing2());
+            register.Register(typeof(Thing1), new Thing1());
+            register.Register(typeof(Thing1), new Thing2());
 
             var factory = register.CreateFactory();
 
@@ -212,8 +212,8 @@ namespace Umbraco.Tests.Composing
             var register = GetRegister();
 
             // define two instances
-            register.RegisterInstance(typeof(IThing), new Thing1());
-            register.RegisterInstance(typeof(IThing), new Thing2());
+            register.Register(typeof(IThing), new Thing1());
+            register.Register(typeof(IThing), new Thing2());
 
             var factory = register.CreateFactory();
 

From e2fe1c82608244e3bb77596079f7884bff8beaaf Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 15:01:24 +0100
Subject: [PATCH 65/84] Refactor IValueConnector for Deploy

---
 src/Umbraco.Core/Deploy/IValueConnector.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Deploy/IValueConnector.cs b/src/Umbraco.Core/Deploy/IValueConnector.cs
index 35304e3fde..92589ab6cf 100644
--- a/src/Umbraco.Core/Deploy/IValueConnector.cs
+++ b/src/Umbraco.Core/Deploy/IValueConnector.cs
@@ -17,19 +17,19 @@ namespace Umbraco.Core.Deploy
         IEnumerable<string> PropertyEditorAliases { get; }
 
         /// <summary>
-        /// Gets the deploy property corresponding to a content property.
+        /// Gets the deploy property value corresponding to a content property value, and gather dependencies.
         /// </summary>
-        /// <param name="property">The content property.</param>
+        /// <param name="value">The content property value.</param>
         /// <param name="dependencies">The content dependencies.</param>
         /// <returns>The deploy property value.</returns>
-        string GetValue(Property property, ICollection<ArtifactDependency> dependencies);
+        string ToArtifact(object value, ICollection<ArtifactDependency> dependencies);
 
         /// <summary>
-        /// Sets a content property value using a deploy property.
+        /// Gets the content property value corresponding to a deploy property value.
         /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <param name="alias">The property alias.</param>
         /// <param name="value">The deploy property value.</param>
-        void SetValue(IContentBase content, string alias, string value);
+        /// <param name="currentValue">The current content property value.</param>
+        /// <returns>The content property value.</returns>
+        object FromArtifact(string value, object currentValue);
     }
 }

From 9ba3f4769056ed9889a2662ea1083b4ac59d0d7a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 15:55:18 +0100
Subject: [PATCH 66/84] Cleanup

---
 .../Components/CompositionExtensions.cs          | 16 ++++++++++++++++
 .../Composing/Composers/FileSystemsComposer.cs   |  4 ++--
 src/Umbraco.Core/Composing/IRegister.cs          | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index a4bc82cb4b..bb23e89b81 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -281,6 +281,22 @@ namespace Umbraco.Core.Components
             composition.RegisterUnique(_ => helper);
         }
 
+        /// <summary>
+        /// Sets the underlying media filesystem.
+        /// </summary>
+        /// <param name="composition">A composition.</param>
+        /// <param name="filesystemFactory">A filesystem factory.</param>
+        public static void SetMediaFileSystem(this Composition composition, Func<IFactory, IFileSystem> filesystemFactory)
+            => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(filesystemFactory);
+
+        /// <summary>
+        /// Sets the underlying media filesystem.
+        /// </summary>
+        /// <param name="composition">A composition.</param>
+        /// <param name="filesystemFactory">A filesystem factory.</param>
+        public static void SetMediaFileSystem(this Composition composition, Func<IFileSystem> filesystemFactory)
+            => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => filesystemFactory());
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs b/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
index ab4bd015de..4c598f27e4 100644
--- a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
+++ b/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs
@@ -88,9 +88,9 @@ namespace Umbraco.Core.Composing.Composers
             composition.Register(factory => new SupportingFileSystems(factory), Lifetime.Singleton);
 
             // register the IFileSystem supporting the IMediaFileSystem
-            // this is the only thing that need to be overriden to change the supporting filesystem
+            // THIS IS THE ONLY THING THAT NEEDS TO CHANGE, IN ORDER TO REPLACE THE UNDERLYING FILESYSTEM
             // and, SupportingFileSystem.For<IMediaFileSystem>() returns the underlying filesystem
-            composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => new PhysicalFileSystem("~/media"));
+            composition.SetMediaFileSystem(() => new PhysicalFileSystem("~/media"));
 
             return composition;
         }
diff --git a/src/Umbraco.Core/Composing/IRegister.cs b/src/Umbraco.Core/Composing/IRegister.cs
index 3e6aed67ee..cbf12f54a3 100644
--- a/src/Umbraco.Core/Composing/IRegister.cs
+++ b/src/Umbraco.Core/Composing/IRegister.cs
@@ -36,24 +36,40 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Registers a service for a target, as its own implementation.
         /// </summary>
+        /// <remarks>
+        /// There can only be one implementation or instanced registered for a service and target;
+        /// what happens if many are registered is not specified.
+        /// </remarks>
         void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
             where TService : class;
 
         /// <summary>
         /// Registers a service for a target, with an implementation type.
         /// </summary>
+        /// <remarks>
+        /// There can only be one implementation or instanced registered for a service and target;
+        /// what happens if many are registered is not specified.
+        /// </remarks>
         void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
             where TService : class;
 
         /// <summary>
         /// Registers a service for a target, with an implementation factory.
         /// </summary>
+        /// <remarks>
+        /// There can only be one implementation or instanced registered for a service and target;
+        /// what happens if many are registered is not specified.
+        /// </remarks>
         void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
             where TService : class;
 
         /// <summary>
         /// Registers a service for a target, with an implementing instance.
         /// </summary>
+        /// <remarks>
+        /// There can only be one implementation or instanced registered for a service and target;
+        /// what happens if many are registered is not specified.
+        /// </remarks>
         void RegisterFor<TService, TTarget>(TService instance)
             where TService : class;
 

From 4ad2505bea438f3e0d35c02cce350d7d58c13d93 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 14 Jan 2019 15:48:24 +0100
Subject: [PATCH 67/84] Identify element types

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  1 +
 .../V_8_0_0/AddContentTypeIsElementColumn.cs  | 15 ++++++++++
 src/Umbraco.Core/Models/ContentTypeBase.cs    | 10 +++++++
 .../Models/ContentTypeBaseExtensions.cs       |  3 +-
 src/Umbraco.Core/Models/IContentTypeBase.cs   | 12 +++++++-
 .../PublishedContent/PublishedItemType.cs     |  7 ++++-
 .../Persistence/Dtos/ContentTypeDto.cs        |  4 +++
 .../Factories/ContentTypeFactory.cs           |  2 ++
 .../Persistence/Mappers/ContentTypeMapper.cs  |  1 +
 .../Persistence/Mappers/MediaTypeMapper.cs    |  1 +
 .../Persistence/Mappers/MemberTypeMapper.cs   |  1 +
 .../Implement/ContentTypeRepositoryBase.cs    |  6 ++--
 .../Services/EntityXmlSerializer.cs           |  3 +-
 .../Services/Implement/PackagingService.cs    |  4 +++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../PublishedContent/PublishedContentTests.cs |  1 -
 .../Services/ContentTypeServiceTests.cs       | 30 +++++++++++++++++++
 .../ContentEditing/ContentItemDisplay.cs      |  8 ++++-
 .../Models/Mapping/ContentMapperProfile.cs    |  5 ++--
 19 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index b469c02a3c..9ec970f1fe 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -121,6 +121,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<DropTaskTables>("{648A2D5F-7467-48F8-B309-E99CEEE00E2A}"); // fixed version
             To<MakeTagsVariant>("{C39BF2A7-1454-4047-BBFE-89E40F66ED63}");
             To<MakeRedirectUrlVariant>("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
+            To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
new file mode 100644
index 0000000000..1df11a3e99
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
@@ -0,0 +1,15 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class AddContentTypeIsElementColumn : MigrationBase
+    {
+        public AddContentTypeIsElementColumn(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            AddColumn<ContentTypeDto>("isElement");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 88b1179f6d..b6ea9f50a0 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -26,6 +26,7 @@ namespace Umbraco.Core.Models
         private string _thumbnail = "folder.png";
         private bool _allowedAsRoot; // note: only one that's not 'pure element type'
         private bool _isContainer;
+        private bool _isElement;
         private PropertyGroupCollection _propertyGroups;
         private PropertyTypeCollection _noGroupPropertyTypes;
         private IEnumerable<ContentTypeSort> _allowedContentTypes;
@@ -90,6 +91,7 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo IconSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Icon);
             public readonly PropertyInfo ThumbnailSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Thumbnail);
             public readonly PropertyInfo AllowedAsRootSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.AllowedAsRoot);
+            public readonly PropertyInfo IsElementSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsElement);
             public readonly PropertyInfo IsContainerSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsContainer);
             public readonly PropertyInfo AllowedContentTypesSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<ContentTypeSort>>(x => x.AllowedContentTypes);
             public readonly PropertyInfo PropertyGroupsSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, PropertyGroupCollection>(x => x.PropertyGroups);
@@ -180,6 +182,14 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _isContainer, Ps.Value.IsContainerSelector);
         }
 
+        /// <inheritdoc />
+        [DataMember]
+        public bool IsElement
+        {
+            get => _isElement;
+            set => SetPropertyValueAndDetectChanges(value, ref _isElement, Ps.Value.IsElementSelector);
+        }
+
         /// <summary>
         /// Gets or sets a list of integer Ids for allowed ContentTypes
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
index 8af48bb881..adbc3de54f 100644
--- a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
@@ -15,7 +15,8 @@ namespace Umbraco.Core.Models
         {
             var type = contentType.GetType();
             var itemType = PublishedItemType.Unknown;
-            if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
+            if (contentType.IsElement) itemType = PublishedItemType.Element;
+            else if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
             else if (typeof(IMediaType).IsAssignableFrom(type)) itemType = PublishedItemType.Media;
             else if (typeof(IMemberType).IsAssignableFrom(type)) itemType = PublishedItemType.Member;
             return itemType;
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index a1d4aee02f..787e347b37 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
         /// the icon (eg. <c>icon-home</c>) along with an optional CSS class name representing the
         /// color (eg. <c>icon-blue</c>). Put together, the value for this scenario would be
         /// <c>icon-home color-blue</c>.
-        /// 
+        ///
         /// If a class name for the color isn't specified, the icon color will default to black.
         /// </summary>
         string Icon { get; set; }
@@ -48,6 +48,16 @@ namespace Umbraco.Core.Models
         /// </remarks>
         bool IsContainer { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this content type is for an element.
+        /// </summary>
+        /// <remarks>
+        /// <para>By default a content type is for a true media, member or document, but
+        /// it can also be for an element, ie a subset that can for instance be used in
+        /// nested content.</para>
+        /// </remarks>
+        bool IsElement { get; set; }
+
         /// <summary>
         /// Gets or sets the content variation of the content type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
index e55fe66945..42e9c9538d 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
@@ -4,13 +4,18 @@
     /// The type of published element.
     /// </summary>
     /// <remarks>Can be a simple element, or a document, a media, a member.</remarks>
-    public enum PublishedItemType // fixme - need to rename to PublishedElementType but then conflicts?
+    public enum PublishedItemType
     {
         /// <summary>
         /// Unknown.
         /// </summary>
         Unknown = 0,
 
+        /// <summary>
+        /// An element.
+        /// </summary>
+        Element,
+
         /// <summary>
         /// A document.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
index d930abc54c..4f3a67aa91 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
@@ -41,6 +41,10 @@ namespace Umbraco.Core.Persistence.Dtos
         [Constraint(Default = "0")]
         public bool IsContainer { get; set; }
 
+        [Column("isElement")]
+        [Constraint(Default = "0")]
+        public bool IsElement { get; set; }
+
         [Column("allowAtRoot")]
         [Constraint(Default = "0")]
         public bool AllowAtRoot { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
index 38a1aa2aab..7a04a6d0d9 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
@@ -107,6 +107,7 @@ namespace Umbraco.Core.Persistence.Factories
             entity.CreatorId = dto.NodeDto.UserId ?? Constants.Security.UnknownUserId;
             entity.AllowedAsRoot = dto.AllowAtRoot;
             entity.IsContainer = dto.IsContainer;
+            entity.IsElement = dto.IsElement;
             entity.Trashed = dto.NodeDto.Trashed;
             entity.Variations = (ContentVariation) dto.Variations;
         }
@@ -132,6 +133,7 @@ namespace Umbraco.Core.Persistence.Factories
                 NodeId = entity.Id,
                 AllowAtRoot = entity.AllowedAsRoot,
                 IsContainer = entity.IsContainer,
+                IsElement = entity.IsElement,
                 Variations = (byte) entity.Variations,
                 NodeDto = BuildNodeDto(entity, nodeObjectType)
             };
diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
index c692a75474..a24963bace 100644
--- a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<ContentType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<ContentType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<ContentType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<ContentType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<ContentType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
index 3f5a6e24bc..6cf83bc7aa 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MediaType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MediaType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MediaType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<MediaType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MediaType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
index 28dc19171f..9a4e4ec040 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MemberType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MemberType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MemberType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<MemberType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MemberType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 662254d1ee..683df047f8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1283,7 +1283,7 @@ AND umbracoNode.id <> @id",
                 if (db == null) throw new ArgumentNullException(nameof(db));
 
                 var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId, ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1384,6 +1384,7 @@ AND umbracoNode.id <> @id",
                     Description = currCt.ctDesc,
                     Icon = currCt.ctIcon,
                     IsContainer = currCt.ctIsContainer,
+                    IsElement = currCt.ctIsElement,
                     NodeId = currCt.ctId,
                     PrimaryKey = currCt.ctPk,
                     Thumbnail = currCt.ctThumb,
@@ -1422,7 +1423,7 @@ AND umbracoNode.id <> @id",
 
                 var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId,
                                 cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId,ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1559,6 +1560,7 @@ AND umbracoNode.id <> @id",
                         Description = currCt.ctDesc,
                         Icon = currCt.ctIcon,
                         IsContainer = currCt.ctIsContainer,
+                        IsElement = currCt.ctIsElement,
                         NodeId = currCt.ctId,
                         PrimaryKey = currCt.ctPk,
                         Thumbnail = currCt.ctThumb,
diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index d938e032a8..38d5471bb7 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -337,7 +337,8 @@ namespace Umbraco.Core.Services
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
                                     new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
-                                    new XElement("IsListView", contentType.IsContainer.ToString()));
+                                    new XElement("IsListView", contentType.IsContainer.ToString()),
+                                    new XElement("IsElement", contentType.IsElement.ToString()));
 
             var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
             if(masterContentType != null)
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 106d2b9f12..8f6c287cf1 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -578,6 +578,10 @@ namespace Umbraco.Core.Services.Implement
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
 
+            var isElement = infoElement.Element("IsElement");
+            if (isListView != null)
+                contentType.IsElement = isElement.Value.InvariantEquals("true");
+
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a01bbf1746..33858c0f91 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -375,6 +375,7 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables1A.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 914956dce1..ab65ac82b1 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -233,7 +233,6 @@ namespace Umbraco.Tests.PublishedContent
         }
 
         [Test]
-        [Ignore("Fails as long as PublishedContentModel is internal.")] // fixme
         public void Is_Last_From_Where_Filter2()
         {
             var doc = GetNode(1173);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index b1a8fa26a8..8dc8a2b45c 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -22,6 +22,36 @@ namespace Umbraco.Tests.Services
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
     public class ContentTypeServiceTests : TestWithSomeContentBase
     {
+        [Test]
+        public void CanSaveAndGetIsElement()
+        {
+            //create content type with a property type that varies by culture
+            IContentType contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Nothing;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
+            Assert.IsFalse(contentType.IsElement);
+
+            contentType.IsElement = true;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
+            Assert.IsTrue(contentType.IsElement);
+        }
+
         [Test]
         public void Change_Content_Type_Variation_Clears_Redirects()
         {
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index 4908025351..80358bfc7a 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -86,6 +86,12 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        /// <summary>
+        /// Indicates if the content is configured as an element
+        /// </summary>
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         /// <summary>
         /// Property indicating if this item is part of a list view parent
         /// </summary>
@@ -117,7 +123,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </remarks>
         [DataMember(Name = "updateDate")]
         public DateTime UpdateDate { get; set; }
-        
+
         [DataMember(Name = "template")]
         public string TemplateAlias { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 6de3bdc02c..1caf81a1eb 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -46,6 +46,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
                 .ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer))
+                .ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement))
                 .ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint))
                 .ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
@@ -59,7 +60,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.AllowedTemplates, opt =>
                     opt.MapFrom(content => content.ContentType.AllowedTemplates
                         .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
-                        .ToDictionary(t => t.Alias, t => t.Name)))                
+                        .ToDictionary(t => t.Alias, t => t.Name)))
                 .ForMember(dest => dest.AllowedActions, opt => opt.ResolveUsing(src => actionButtonsResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
@@ -140,5 +141,5 @@ namespace Umbraco.Web.Models.Mapping
                 return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"(({source.Name}))";
             }
         }
-    }    
+    }
 }

From 9bc047c03f50e4795fc0d13b71af8218889d1e5a Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Tue, 15 Jan 2019 10:17:26 +0100
Subject: [PATCH 68/84] Adding code to re-validate on value change

---
 .../directives/components/tags/umbtagseditor.directive.js    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index fea7528d5b..125f5ffb65 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -182,6 +182,9 @@
             else {
                 vm.onValueChanged({ value: [] });
             }
+            
+            //this is required to re-validate
+            $scope.propertyForm.tagCount.$setViewValue($scope.model.value.length);
         }
 
         /**
@@ -189,7 +192,7 @@
          */
         function validateMandatory() {
             return {
-                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0) || (vm.value != null && vm.value.length > 0),
+                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0),
                 errorMsg: "Value cannot be empty",
                 errorKey: "required"
             };

From 0092cac394037f1ec2696718954e6e4be4f1d90a Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Tue, 15 Jan 2019 10:31:12 +0100
Subject: [PATCH 69/84] DRY

---
 .../components/tags/umbtagseditor.directive.js     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 125f5ffb65..92c9d57ee8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -130,8 +130,7 @@
                 if (!changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
 
                     configureViewModel();
-                    //this is required to re-validate
-                    vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
+                    reValidate()
 
                 }
             }
@@ -183,8 +182,7 @@
                 vm.onValueChanged({ value: [] });
             }
             
-            //this is required to re-validate
-            $scope.propertyForm.tagCount.$setViewValue($scope.model.value.length);
+            reValidate();
         }
 
         /**
@@ -273,8 +271,12 @@
                 return ($.inArray(suggestion.value, vm.viewModel) === -1);
             });
         }
-
-
+        
+        function reValidate() {
+            //this is required to re-validate
+            vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
+        {
+            
     }
 
 })();

From ba38b67b9d4cdd58d33a729b62181700b3d51dbe Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 11:30:30 +0100
Subject: [PATCH 70/84] Support IContentType.IsElement

---
 .../services/umbdataformatter.service.js      | 18 +++++++--------
 .../permissions/permissions.controller.js     | 22 +++++++------------
 .../views/permissions/permissions.html        | 20 +++++++++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  2 ++
 .../Umbraco/config/lang/en_us.xml             |  2 ++
 .../ContentTypeCompositionDisplay.cs          |  4 ++++
 .../Models/ContentEditing/ContentTypeSave.cs  |  3 +++
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index e31742e660..1e6fc5d643 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -64,7 +64,7 @@
                 var saveModel = _.pick(displayModel,
                     'compositeContentTypes', 'isContainer', 'allowAsRoot', 'allowedTemplates', 'allowedContentTypes',
                     'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
-                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant');
+                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
 
                 //TODO: Map these
                 saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
@@ -262,7 +262,7 @@
                     saveModel[props[m]] = startId.id;
                 }
 
-                saveModel.parentId = -1; 
+                saveModel.parentId = -1;
                 return saveModel;
             },
 
@@ -293,7 +293,7 @@
                 });
                 saveModel.email = propEmail.value.trim();
                 saveModel.username = propLogin.value.trim();
-                
+
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 
                 var selectedGroups = [];
@@ -336,7 +336,7 @@
 
             /** formats the display model used to display the media to the model used to save the media */
             formatMediaPostData: function (displayModel, action) {
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -354,7 +354,7 @@
             /** formats the display model used to display the content to the model used to save the content  */
             formatContentPostData: function (displayModel, action) {
 
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -379,7 +379,7 @@
                 var propExpireDate = displayModel.removeDate;
                 var propReleaseDate = displayModel.releaseDate;
                 var propTemplate = displayModel.template;
-            
+
                 saveModel.expireDate = propExpireDate ? propExpireDate : null;
                 saveModel.releaseDate = propReleaseDate ? propReleaseDate : null;
                 saveModel.templateAlias = propTemplate ? propTemplate : null;
@@ -389,8 +389,8 @@
 
             /**
              * This formats the server GET response for a content display item
-             * @param {} displayModel 
-             * @returns {} 
+             * @param {} displayModel
+             * @returns {}
              */
             formatContentGetData: function(displayModel) {
 
@@ -418,7 +418,7 @@
                             }
                         });
                     });
-                    
+
 
                     //now assign this same invariant property instance to the same index of the other variants property array
                     for (var j = 1; j < displayModel.variants.length; j++) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
index 4a7a870618..317fe094ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
@@ -25,6 +25,7 @@
         vm.removeChild = removeChild;
         vm.toggleAllowAsRoot = toggleAllowAsRoot;
         vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
+        vm.toggleIsElement = toggleIsElement;
 
         /* ---------- INIT ---------- */
 
@@ -84,25 +85,18 @@
            $scope.model.allowedContentTypes.splice(selectedChildIndex, 1);
         }
 
-        /**
-         * Toggle the $scope.model.allowAsRoot value to either true or false
-         */
-        function toggleAllowAsRoot(){
-            if($scope.model.allowAsRoot){
-                $scope.model.allowAsRoot = false;
-                return;
-            }
+        // note: "safe toggling" here ie handling cases where the value is undefined, etc
 
-            $scope.model.allowAsRoot = true;
+        function toggleAllowAsRoot() {
+            $scope.model.allowAsRoot = $scope.model.allowAsRoot ? false : true;
         }
 
         function toggleAllowCultureVariants() {
-            if ($scope.model.allowCultureVariant) {
-                $scope.model.allowCultureVariant = false;
-                return;
-            }
+            $scope.model.allowCultureVariant = $scope.model.allowCultureVariant ? false : true;
+        }
 
-            $scope.model.allowCultureVariant = true;
+        function toggleIsElement() {
+            $scope.model.isElement = $scope.model.isElement ? false : true;
         }
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
index ec1e528f8c..0d74c655d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
@@ -53,9 +53,25 @@
                                 hotkey="alt+shift+v">
                     </umb-toggle>
                 </div>
-    
+
             </div>
 
-        </umb-box-content>
+            <div class="sub-view-columns">
+
+                <div class="sub-view-column-left">
+                    <h5><localize key="contentTypeEditor_elementHeading" /></h5>
+                    <small><localize key="contentTypeEditor_elementDescription" /></small>
+                </div>
+
+                <div class="sub-view-column-right">
+                    <umb-toggle data-element="permissions-is-element"
+                                checked="model.isElement"
+                                on-click="vm.toggleIsElement()">
+                    </umb-toggle>
+                </div>
+
+            </div>
+
+            </umb-box-content>
     </umb-box>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 386d3af518..987203442a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1518,6 +1518,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</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 5de373f571..1860d3afc9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1559,6 +1559,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
index 7211ddbf61..e5e74c2749 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
@@ -26,6 +26,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        //Element
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         [DataMember(Name = "listViewEditorName")]
         [ReadOnly(true)]
         public string ListViewEditorName { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
index c2ec70d3dc..b1d24c5fd2 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
@@ -25,6 +25,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         [DataMember(Name = "allowAsRoot")]
         public bool AllowAsRoot { get; set; }
 

From 5b1ca92184fa9962a7306f0db09ac36c37d5f777 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 12:12:35 +0100
Subject: [PATCH 71/84] Fixes for tag validation and build

---
 .../components/tags/umbtagseditor.directive.js         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 92c9d57ee8..3d784c999f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -181,7 +181,7 @@
             else {
                 vm.onValueChanged({ value: [] });
             }
-            
+
             reValidate();
         }
 
@@ -190,7 +190,7 @@
          */
         function validateMandatory() {
             return {
-                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0),
+                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0)|| (vm.value != null && vm.value.length > 0),
                 errorMsg: "Value cannot be empty",
                 errorKey: "required"
             };
@@ -271,12 +271,12 @@
                 return ($.inArray(suggestion.value, vm.viewModel) === -1);
             });
         }
-        
+
         function reValidate() {
             //this is required to re-validate
             vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
-        {
-            
+        }
+
     }
 
 })();

From a5efc25c8152db9a4d38b138a0e3f46c9cc5ea93 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 12:23:14 +0100
Subject: [PATCH 72/84] Revert "Support IContentType.IsElement"

This reverts commit ba38b67b
---
 .../services/umbdataformatter.service.js      | 18 +++++++--------
 .../permissions/permissions.controller.js     | 22 ++++++++++++-------
 .../views/permissions/permissions.html        | 20 ++---------------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  2 --
 .../Umbraco/config/lang/en_us.xml             |  2 --
 .../ContentTypeCompositionDisplay.cs          |  4 ----
 .../Models/ContentEditing/ContentTypeSave.cs  |  3 ---
 7 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index 1e6fc5d643..e31742e660 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -64,7 +64,7 @@
                 var saveModel = _.pick(displayModel,
                     'compositeContentTypes', 'isContainer', 'allowAsRoot', 'allowedTemplates', 'allowedContentTypes',
                     'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
-                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
+                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant');
 
                 //TODO: Map these
                 saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
@@ -262,7 +262,7 @@
                     saveModel[props[m]] = startId.id;
                 }
 
-                saveModel.parentId = -1;
+                saveModel.parentId = -1; 
                 return saveModel;
             },
 
@@ -293,7 +293,7 @@
                 });
                 saveModel.email = propEmail.value.trim();
                 saveModel.username = propLogin.value.trim();
-
+                
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 
                 var selectedGroups = [];
@@ -336,7 +336,7 @@
 
             /** formats the display model used to display the media to the model used to save the media */
             formatMediaPostData: function (displayModel, action) {
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -354,7 +354,7 @@
             /** formats the display model used to display the content to the model used to save the content  */
             formatContentPostData: function (displayModel, action) {
 
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -379,7 +379,7 @@
                 var propExpireDate = displayModel.removeDate;
                 var propReleaseDate = displayModel.releaseDate;
                 var propTemplate = displayModel.template;
-
+            
                 saveModel.expireDate = propExpireDate ? propExpireDate : null;
                 saveModel.releaseDate = propReleaseDate ? propReleaseDate : null;
                 saveModel.templateAlias = propTemplate ? propTemplate : null;
@@ -389,8 +389,8 @@
 
             /**
              * This formats the server GET response for a content display item
-             * @param {} displayModel
-             * @returns {}
+             * @param {} displayModel 
+             * @returns {} 
              */
             formatContentGetData: function(displayModel) {
 
@@ -418,7 +418,7 @@
                             }
                         });
                     });
-
+                    
 
                     //now assign this same invariant property instance to the same index of the other variants property array
                     for (var j = 1; j < displayModel.variants.length; j++) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
index 317fe094ae..4a7a870618 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
@@ -25,7 +25,6 @@
         vm.removeChild = removeChild;
         vm.toggleAllowAsRoot = toggleAllowAsRoot;
         vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
-        vm.toggleIsElement = toggleIsElement;
 
         /* ---------- INIT ---------- */
 
@@ -85,18 +84,25 @@
            $scope.model.allowedContentTypes.splice(selectedChildIndex, 1);
         }
 
-        // note: "safe toggling" here ie handling cases where the value is undefined, etc
+        /**
+         * Toggle the $scope.model.allowAsRoot value to either true or false
+         */
+        function toggleAllowAsRoot(){
+            if($scope.model.allowAsRoot){
+                $scope.model.allowAsRoot = false;
+                return;
+            }
 
-        function toggleAllowAsRoot() {
-            $scope.model.allowAsRoot = $scope.model.allowAsRoot ? false : true;
+            $scope.model.allowAsRoot = true;
         }
 
         function toggleAllowCultureVariants() {
-            $scope.model.allowCultureVariant = $scope.model.allowCultureVariant ? false : true;
-        }
+            if ($scope.model.allowCultureVariant) {
+                $scope.model.allowCultureVariant = false;
+                return;
+            }
 
-        function toggleIsElement() {
-            $scope.model.isElement = $scope.model.isElement ? false : true;
+            $scope.model.allowCultureVariant = true;
         }
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
index 0d74c655d7..ec1e528f8c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
@@ -53,25 +53,9 @@
                                 hotkey="alt+shift+v">
                     </umb-toggle>
                 </div>
-
+    
             </div>
 
-            <div class="sub-view-columns">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_elementHeading" /></h5>
-                    <small><localize key="contentTypeEditor_elementDescription" /></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                    <umb-toggle data-element="permissions-is-element"
-                                checked="model.isElement"
-                                on-click="vm.toggleIsElement()">
-                    </umb-toggle>
-                </div>
-
-            </div>
-
-            </umb-box-content>
+        </umb-box-content>
     </umb-box>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 987203442a..386d3af518 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1518,8 +1518,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
-    <key alias="elementHeading">Is an Element type</key>
-    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</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 1860d3afc9..5de373f571 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1559,8 +1559,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
-    <key alias="elementHeading">Is an Element type</key>
-    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
index e5e74c2749..7211ddbf61 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
@@ -26,10 +26,6 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
-        //Element
-        [DataMember(Name = "isElement")]
-        public bool IsElement { get; set; }
-
         [DataMember(Name = "listViewEditorName")]
         [ReadOnly(true)]
         public string ListViewEditorName { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
index b1d24c5fd2..c2ec70d3dc 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
@@ -25,9 +25,6 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
-        [DataMember(Name = "isElement")]
-        public bool IsElement { get; set; }
-
         [DataMember(Name = "allowAsRoot")]
         public bool AllowAsRoot { get; set; }
 

From ff6a9ba97f17bddd64edb1da5cc0a8858fb336f9 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 12:23:45 +0100
Subject: [PATCH 73/84] Revert "Identify element types"

This reverts commit 4ad2505b
---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  1 -
 .../V_8_0_0/AddContentTypeIsElementColumn.cs  | 15 ----------
 src/Umbraco.Core/Models/ContentTypeBase.cs    | 10 -------
 .../Models/ContentTypeBaseExtensions.cs       |  3 +-
 src/Umbraco.Core/Models/IContentTypeBase.cs   | 12 +-------
 .../PublishedContent/PublishedItemType.cs     |  7 +----
 .../Persistence/Dtos/ContentTypeDto.cs        |  4 ---
 .../Factories/ContentTypeFactory.cs           |  2 --
 .../Persistence/Mappers/ContentTypeMapper.cs  |  1 -
 .../Persistence/Mappers/MediaTypeMapper.cs    |  1 -
 .../Persistence/Mappers/MemberTypeMapper.cs   |  1 -
 .../Implement/ContentTypeRepositoryBase.cs    |  6 ++--
 .../Services/EntityXmlSerializer.cs           |  3 +-
 .../Services/Implement/PackagingService.cs    |  4 ---
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 .../PublishedContent/PublishedContentTests.cs |  1 +
 .../Services/ContentTypeServiceTests.cs       | 30 -------------------
 .../ContentEditing/ContentItemDisplay.cs      |  8 +----
 .../Models/Mapping/ContentMapperProfile.cs    |  5 ++--
 19 files changed, 10 insertions(+), 105 deletions(-)
 delete mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 9ec970f1fe..b469c02a3c 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -121,7 +121,6 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<DropTaskTables>("{648A2D5F-7467-48F8-B309-E99CEEE00E2A}"); // fixed version
             To<MakeTagsVariant>("{C39BF2A7-1454-4047-BBFE-89E40F66ED63}");
             To<MakeRedirectUrlVariant>("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
-            To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
deleted file mode 100644
index 1df11a3e99..0000000000
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Umbraco.Core.Persistence.Dtos;
-
-namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
-{
-    public class AddContentTypeIsElementColumn : MigrationBase
-    {
-        public AddContentTypeIsElementColumn(IMigrationContext context) : base(context)
-        { }
-
-        public override void Migrate()
-        {
-            AddColumn<ContentTypeDto>("isElement");
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index b6ea9f50a0..88b1179f6d 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -26,7 +26,6 @@ namespace Umbraco.Core.Models
         private string _thumbnail = "folder.png";
         private bool _allowedAsRoot; // note: only one that's not 'pure element type'
         private bool _isContainer;
-        private bool _isElement;
         private PropertyGroupCollection _propertyGroups;
         private PropertyTypeCollection _noGroupPropertyTypes;
         private IEnumerable<ContentTypeSort> _allowedContentTypes;
@@ -91,7 +90,6 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo IconSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Icon);
             public readonly PropertyInfo ThumbnailSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Thumbnail);
             public readonly PropertyInfo AllowedAsRootSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.AllowedAsRoot);
-            public readonly PropertyInfo IsElementSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsElement);
             public readonly PropertyInfo IsContainerSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsContainer);
             public readonly PropertyInfo AllowedContentTypesSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<ContentTypeSort>>(x => x.AllowedContentTypes);
             public readonly PropertyInfo PropertyGroupsSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, PropertyGroupCollection>(x => x.PropertyGroups);
@@ -182,14 +180,6 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _isContainer, Ps.Value.IsContainerSelector);
         }
 
-        /// <inheritdoc />
-        [DataMember]
-        public bool IsElement
-        {
-            get => _isElement;
-            set => SetPropertyValueAndDetectChanges(value, ref _isElement, Ps.Value.IsElementSelector);
-        }
-
         /// <summary>
         /// Gets or sets a list of integer Ids for allowed ContentTypes
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
index adbc3de54f..8af48bb881 100644
--- a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
@@ -15,8 +15,7 @@ namespace Umbraco.Core.Models
         {
             var type = contentType.GetType();
             var itemType = PublishedItemType.Unknown;
-            if (contentType.IsElement) itemType = PublishedItemType.Element;
-            else if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
+            if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
             else if (typeof(IMediaType).IsAssignableFrom(type)) itemType = PublishedItemType.Media;
             else if (typeof(IMemberType).IsAssignableFrom(type)) itemType = PublishedItemType.Member;
             return itemType;
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index 787e347b37..a1d4aee02f 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
         /// the icon (eg. <c>icon-home</c>) along with an optional CSS class name representing the
         /// color (eg. <c>icon-blue</c>). Put together, the value for this scenario would be
         /// <c>icon-home color-blue</c>.
-        ///
+        /// 
         /// If a class name for the color isn't specified, the icon color will default to black.
         /// </summary>
         string Icon { get; set; }
@@ -48,16 +48,6 @@ namespace Umbraco.Core.Models
         /// </remarks>
         bool IsContainer { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this content type is for an element.
-        /// </summary>
-        /// <remarks>
-        /// <para>By default a content type is for a true media, member or document, but
-        /// it can also be for an element, ie a subset that can for instance be used in
-        /// nested content.</para>
-        /// </remarks>
-        bool IsElement { get; set; }
-
         /// <summary>
         /// Gets or sets the content variation of the content type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
index 42e9c9538d..e55fe66945 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
@@ -4,18 +4,13 @@
     /// The type of published element.
     /// </summary>
     /// <remarks>Can be a simple element, or a document, a media, a member.</remarks>
-    public enum PublishedItemType
+    public enum PublishedItemType // fixme - need to rename to PublishedElementType but then conflicts?
     {
         /// <summary>
         /// Unknown.
         /// </summary>
         Unknown = 0,
 
-        /// <summary>
-        /// An element.
-        /// </summary>
-        Element,
-
         /// <summary>
         /// A document.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
index 4f3a67aa91..d930abc54c 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
@@ -41,10 +41,6 @@ namespace Umbraco.Core.Persistence.Dtos
         [Constraint(Default = "0")]
         public bool IsContainer { get; set; }
 
-        [Column("isElement")]
-        [Constraint(Default = "0")]
-        public bool IsElement { get; set; }
-
         [Column("allowAtRoot")]
         [Constraint(Default = "0")]
         public bool AllowAtRoot { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
index 7a04a6d0d9..38a1aa2aab 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
@@ -107,7 +107,6 @@ namespace Umbraco.Core.Persistence.Factories
             entity.CreatorId = dto.NodeDto.UserId ?? Constants.Security.UnknownUserId;
             entity.AllowedAsRoot = dto.AllowAtRoot;
             entity.IsContainer = dto.IsContainer;
-            entity.IsElement = dto.IsElement;
             entity.Trashed = dto.NodeDto.Trashed;
             entity.Variations = (ContentVariation) dto.Variations;
         }
@@ -133,7 +132,6 @@ namespace Umbraco.Core.Persistence.Factories
                 NodeId = entity.Id,
                 AllowAtRoot = entity.AllowedAsRoot,
                 IsContainer = entity.IsContainer,
-                IsElement = entity.IsElement,
                 Variations = (byte) entity.Variations,
                 NodeDto = BuildNodeDto(entity, nodeObjectType)
             };
diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
index a24963bace..c692a75474 100644
--- a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<ContentType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<ContentType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<ContentType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
-            CacheMap<ContentType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<ContentType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
index 6cf83bc7aa..3f5a6e24bc 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MediaType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MediaType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MediaType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
-            CacheMap<MediaType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MediaType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
index 9a4e4ec040..28dc19171f 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MemberType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MemberType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MemberType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
-            CacheMap<MemberType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MemberType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 683df047f8..662254d1ee 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1283,7 +1283,7 @@ AND umbracoNode.id <> @id",
                 if (db == null) throw new ArgumentNullException(nameof(db));
 
                 var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId, ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1384,7 +1384,6 @@ AND umbracoNode.id <> @id",
                     Description = currCt.ctDesc,
                     Icon = currCt.ctIcon,
                     IsContainer = currCt.ctIsContainer,
-                    IsElement = currCt.ctIsElement,
                     NodeId = currCt.ctId,
                     PrimaryKey = currCt.ctPk,
                     Thumbnail = currCt.ctThumb,
@@ -1423,7 +1422,7 @@ AND umbracoNode.id <> @id",
 
                 var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId,
                                 cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId,ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1560,7 +1559,6 @@ AND umbracoNode.id <> @id",
                         Description = currCt.ctDesc,
                         Icon = currCt.ctIcon,
                         IsContainer = currCt.ctIsContainer,
-                        IsElement = currCt.ctIsElement,
                         NodeId = currCt.ctId,
                         PrimaryKey = currCt.ctPk,
                         Thumbnail = currCt.ctThumb,
diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index 38d5471bb7..d938e032a8 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -337,8 +337,7 @@ namespace Umbraco.Core.Services
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
                                     new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
-                                    new XElement("IsListView", contentType.IsContainer.ToString()),
-                                    new XElement("IsElement", contentType.IsElement.ToString()));
+                                    new XElement("IsListView", contentType.IsContainer.ToString()));
 
             var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
             if(masterContentType != null)
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 8f6c287cf1..106d2b9f12 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -578,10 +578,6 @@ namespace Umbraco.Core.Services.Implement
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
 
-            var isElement = infoElement.Element("IsElement");
-            if (isListView != null)
-                contentType.IsElement = isElement.Value.InvariantEquals("true");
-
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7d65a46f49..609befd233 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -377,7 +377,6 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables1A.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index ab65ac82b1..914956dce1 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -233,6 +233,7 @@ namespace Umbraco.Tests.PublishedContent
         }
 
         [Test]
+        [Ignore("Fails as long as PublishedContentModel is internal.")] // fixme
         public void Is_Last_From_Where_Filter2()
         {
             var doc = GetNode(1173);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index 8dc8a2b45c..b1a8fa26a8 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -22,36 +22,6 @@ namespace Umbraco.Tests.Services
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
     public class ContentTypeServiceTests : TestWithSomeContentBase
     {
-        [Test]
-        public void CanSaveAndGetIsElement()
-        {
-            //create content type with a property type that varies by culture
-            IContentType contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
-            Assert.IsFalse(contentType.IsElement);
-
-            contentType.IsElement = true;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
-            Assert.IsTrue(contentType.IsElement);
-        }
-
         [Test]
         public void Change_Content_Type_Variation_Clears_Redirects()
         {
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index 80358bfc7a..4908025351 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -86,12 +86,6 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
-        /// <summary>
-        /// Indicates if the content is configured as an element
-        /// </summary>
-        [DataMember(Name = "isElement")]
-        public bool IsElement { get; set; }
-
         /// <summary>
         /// Property indicating if this item is part of a list view parent
         /// </summary>
@@ -123,7 +117,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </remarks>
         [DataMember(Name = "updateDate")]
         public DateTime UpdateDate { get; set; }
-
+        
         [DataMember(Name = "template")]
         public string TemplateAlias { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 1caf81a1eb..6de3bdc02c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -46,7 +46,6 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
                 .ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer))
-                .ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement))
                 .ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint))
                 .ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
@@ -60,7 +59,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.AllowedTemplates, opt =>
                     opt.MapFrom(content => content.ContentType.AllowedTemplates
                         .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
-                        .ToDictionary(t => t.Alias, t => t.Name)))
+                        .ToDictionary(t => t.Alias, t => t.Name)))                
                 .ForMember(dest => dest.AllowedActions, opt => opt.ResolveUsing(src => actionButtonsResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
@@ -141,5 +140,5 @@ namespace Umbraco.Web.Models.Mapping
                 return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"(({source.Name}))";
             }
         }
-    }
+    }    
 }

From 93ba694106d2f435126a495b8111df01ed3e43b8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 13:36:30 +0100
Subject: [PATCH 74/84] Upgrade ModelsBuilder (bugfix)

---
 build/NuSpecs/UmbracoCms.nuspec          | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 565d693979..1b7a1c5ae1 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.31]" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.32]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
             <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7a59b15eb3..ca4acd9d66 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -107,7 +107,7 @@
     <PackageReference Include="MySql.Data" Version="6.10.7" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.31</Version>
+      <Version>8.0.0-alpha.32</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>

From 5995a7ec843e5ca50d36a98eb4f7fd0de03e4cb4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 15:05:04 +0100
Subject: [PATCH 75/84] a small change to let Git see changes

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 9ec970f1fe..51935e6517 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -123,6 +123,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<MakeRedirectUrlVariant>("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
             To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
 
+
             //FINAL
 
 

From 11ffafacdf42a461b793df8a3e32fda1c88b6a4f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 15:12:59 +0100
Subject: [PATCH 76/84] Revert "Revert "Identify element types""

This reverts commit ff6a9ba9
---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  1 +
 .../V_8_0_0/AddContentTypeIsElementColumn.cs  | 15 ++++++++++
 src/Umbraco.Core/Models/ContentTypeBase.cs    | 10 +++++++
 .../Models/ContentTypeBaseExtensions.cs       |  3 +-
 src/Umbraco.Core/Models/IContentTypeBase.cs   | 12 +++++++-
 .../PublishedContent/PublishedItemType.cs     |  7 ++++-
 .../Persistence/Dtos/ContentTypeDto.cs        |  4 +++
 .../Factories/ContentTypeFactory.cs           |  2 ++
 .../Persistence/Mappers/ContentTypeMapper.cs  |  1 +
 .../Persistence/Mappers/MediaTypeMapper.cs    |  1 +
 .../Persistence/Mappers/MemberTypeMapper.cs   |  1 +
 .../Implement/ContentTypeRepositoryBase.cs    |  6 ++--
 .../Services/EntityXmlSerializer.cs           |  3 +-
 .../Services/Implement/PackagingService.cs    |  4 +++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../PublishedContent/PublishedContentTests.cs |  1 -
 .../Services/ContentTypeServiceTests.cs       | 30 +++++++++++++++++++
 .../ContentEditing/ContentItemDisplay.cs      |  8 ++++-
 .../Models/Mapping/ContentMapperProfile.cs    |  5 ++--
 19 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index b469c02a3c..9ec970f1fe 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -121,6 +121,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<DropTaskTables>("{648A2D5F-7467-48F8-B309-E99CEEE00E2A}"); // fixed version
             To<MakeTagsVariant>("{C39BF2A7-1454-4047-BBFE-89E40F66ED63}");
             To<MakeRedirectUrlVariant>("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
+            To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
new file mode 100644
index 0000000000..1df11a3e99
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentTypeIsElementColumn.cs
@@ -0,0 +1,15 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class AddContentTypeIsElementColumn : MigrationBase
+    {
+        public AddContentTypeIsElementColumn(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            AddColumn<ContentTypeDto>("isElement");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 88b1179f6d..b6ea9f50a0 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -26,6 +26,7 @@ namespace Umbraco.Core.Models
         private string _thumbnail = "folder.png";
         private bool _allowedAsRoot; // note: only one that's not 'pure element type'
         private bool _isContainer;
+        private bool _isElement;
         private PropertyGroupCollection _propertyGroups;
         private PropertyTypeCollection _noGroupPropertyTypes;
         private IEnumerable<ContentTypeSort> _allowedContentTypes;
@@ -90,6 +91,7 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo IconSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Icon);
             public readonly PropertyInfo ThumbnailSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Thumbnail);
             public readonly PropertyInfo AllowedAsRootSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.AllowedAsRoot);
+            public readonly PropertyInfo IsElementSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsElement);
             public readonly PropertyInfo IsContainerSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsContainer);
             public readonly PropertyInfo AllowedContentTypesSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<ContentTypeSort>>(x => x.AllowedContentTypes);
             public readonly PropertyInfo PropertyGroupsSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, PropertyGroupCollection>(x => x.PropertyGroups);
@@ -180,6 +182,14 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _isContainer, Ps.Value.IsContainerSelector);
         }
 
+        /// <inheritdoc />
+        [DataMember]
+        public bool IsElement
+        {
+            get => _isElement;
+            set => SetPropertyValueAndDetectChanges(value, ref _isElement, Ps.Value.IsElementSelector);
+        }
+
         /// <summary>
         /// Gets or sets a list of integer Ids for allowed ContentTypes
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
index 8af48bb881..adbc3de54f 100644
--- a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
@@ -15,7 +15,8 @@ namespace Umbraco.Core.Models
         {
             var type = contentType.GetType();
             var itemType = PublishedItemType.Unknown;
-            if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
+            if (contentType.IsElement) itemType = PublishedItemType.Element;
+            else if (typeof(IContentType).IsAssignableFrom(type)) itemType = PublishedItemType.Content;
             else if (typeof(IMediaType).IsAssignableFrom(type)) itemType = PublishedItemType.Media;
             else if (typeof(IMemberType).IsAssignableFrom(type)) itemType = PublishedItemType.Member;
             return itemType;
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index a1d4aee02f..787e347b37 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
         /// the icon (eg. <c>icon-home</c>) along with an optional CSS class name representing the
         /// color (eg. <c>icon-blue</c>). Put together, the value for this scenario would be
         /// <c>icon-home color-blue</c>.
-        /// 
+        ///
         /// If a class name for the color isn't specified, the icon color will default to black.
         /// </summary>
         string Icon { get; set; }
@@ -48,6 +48,16 @@ namespace Umbraco.Core.Models
         /// </remarks>
         bool IsContainer { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this content type is for an element.
+        /// </summary>
+        /// <remarks>
+        /// <para>By default a content type is for a true media, member or document, but
+        /// it can also be for an element, ie a subset that can for instance be used in
+        /// nested content.</para>
+        /// </remarks>
+        bool IsElement { get; set; }
+
         /// <summary>
         /// Gets or sets the content variation of the content type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
index e55fe66945..42e9c9538d 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
@@ -4,13 +4,18 @@
     /// The type of published element.
     /// </summary>
     /// <remarks>Can be a simple element, or a document, a media, a member.</remarks>
-    public enum PublishedItemType // fixme - need to rename to PublishedElementType but then conflicts?
+    public enum PublishedItemType
     {
         /// <summary>
         /// Unknown.
         /// </summary>
         Unknown = 0,
 
+        /// <summary>
+        /// An element.
+        /// </summary>
+        Element,
+
         /// <summary>
         /// A document.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
index d930abc54c..4f3a67aa91 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
@@ -41,6 +41,10 @@ namespace Umbraco.Core.Persistence.Dtos
         [Constraint(Default = "0")]
         public bool IsContainer { get; set; }
 
+        [Column("isElement")]
+        [Constraint(Default = "0")]
+        public bool IsElement { get; set; }
+
         [Column("allowAtRoot")]
         [Constraint(Default = "0")]
         public bool AllowAtRoot { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
index 38a1aa2aab..7a04a6d0d9 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
@@ -107,6 +107,7 @@ namespace Umbraco.Core.Persistence.Factories
             entity.CreatorId = dto.NodeDto.UserId ?? Constants.Security.UnknownUserId;
             entity.AllowedAsRoot = dto.AllowAtRoot;
             entity.IsContainer = dto.IsContainer;
+            entity.IsElement = dto.IsElement;
             entity.Trashed = dto.NodeDto.Trashed;
             entity.Variations = (ContentVariation) dto.Variations;
         }
@@ -132,6 +133,7 @@ namespace Umbraco.Core.Persistence.Factories
                 NodeId = entity.Id,
                 AllowAtRoot = entity.AllowedAsRoot,
                 IsContainer = entity.IsContainer,
+                IsElement = entity.IsElement,
                 Variations = (byte) entity.Variations,
                 NodeDto = BuildNodeDto(entity, nodeObjectType)
             };
diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
index c692a75474..a24963bace 100644
--- a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<ContentType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<ContentType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<ContentType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<ContentType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<ContentType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
index 3f5a6e24bc..6cf83bc7aa 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MediaType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MediaType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MediaType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<MediaType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MediaType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
index 28dc19171f..9a4e4ec040 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<MemberType, ContentTypeDto>(src => src.Description, dto => dto.Description);
             CacheMap<MemberType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
             CacheMap<MemberType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<MemberType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
             CacheMap<MemberType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 662254d1ee..683df047f8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1283,7 +1283,7 @@ AND umbracoNode.id <> @id",
                 if (db == null) throw new ArgumentNullException(nameof(db));
 
                 var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId, ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1384,6 +1384,7 @@ AND umbracoNode.id <> @id",
                     Description = currCt.ctDesc,
                     Icon = currCt.ctIcon,
                     IsContainer = currCt.ctIsContainer,
+                    IsElement = currCt.ctIsElement,
                     NodeId = currCt.ctId,
                     PrimaryKey = currCt.ctPk,
                     Thumbnail = currCt.ctThumb,
@@ -1422,7 +1423,7 @@ AND umbracoNode.id <> @id",
 
                 var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId,
                                 cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations,
-                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                 ParentTypes.parentContentTypeId as chtParentId,ParentTypes.parentContentTypeKey as chtParentKey,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
@@ -1559,6 +1560,7 @@ AND umbracoNode.id <> @id",
                         Description = currCt.ctDesc,
                         Icon = currCt.ctIcon,
                         IsContainer = currCt.ctIsContainer,
+                        IsElement = currCt.ctIsElement,
                         NodeId = currCt.ctId,
                         PrimaryKey = currCt.ctPk,
                         Thumbnail = currCt.ctThumb,
diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index d938e032a8..38d5471bb7 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -337,7 +337,8 @@ namespace Umbraco.Core.Services
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
                                     new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
-                                    new XElement("IsListView", contentType.IsContainer.ToString()));
+                                    new XElement("IsListView", contentType.IsContainer.ToString()),
+                                    new XElement("IsElement", contentType.IsElement.ToString()));
 
             var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
             if(masterContentType != null)
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 106d2b9f12..8f6c287cf1 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -578,6 +578,10 @@ namespace Umbraco.Core.Services.Implement
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
 
+            var isElement = infoElement.Element("IsElement");
+            if (isListView != null)
+                contentType.IsElement = isElement.Value.InvariantEquals("true");
+
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 609befd233..7d65a46f49 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -377,6 +377,7 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables1A.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 914956dce1..ab65ac82b1 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -233,7 +233,6 @@ namespace Umbraco.Tests.PublishedContent
         }
 
         [Test]
-        [Ignore("Fails as long as PublishedContentModel is internal.")] // fixme
         public void Is_Last_From_Where_Filter2()
         {
             var doc = GetNode(1173);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index b1a8fa26a8..8dc8a2b45c 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -22,6 +22,36 @@ namespace Umbraco.Tests.Services
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
     public class ContentTypeServiceTests : TestWithSomeContentBase
     {
+        [Test]
+        public void CanSaveAndGetIsElement()
+        {
+            //create content type with a property type that varies by culture
+            IContentType contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Nothing;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
+            Assert.IsFalse(contentType.IsElement);
+
+            contentType.IsElement = true;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            contentType = ServiceContext.ContentTypeService.Get(contentType.Id);
+            Assert.IsTrue(contentType.IsElement);
+        }
+
         [Test]
         public void Change_Content_Type_Variation_Clears_Redirects()
         {
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index 4908025351..80358bfc7a 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -86,6 +86,12 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        /// <summary>
+        /// Indicates if the content is configured as an element
+        /// </summary>
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         /// <summary>
         /// Property indicating if this item is part of a list view parent
         /// </summary>
@@ -117,7 +123,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </remarks>
         [DataMember(Name = "updateDate")]
         public DateTime UpdateDate { get; set; }
-        
+
         [DataMember(Name = "template")]
         public string TemplateAlias { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 6de3bdc02c..1caf81a1eb 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -46,6 +46,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
                 .ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer))
+                .ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement))
                 .ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint))
                 .ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
@@ -59,7 +60,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dest => dest.AllowedTemplates, opt =>
                     opt.MapFrom(content => content.ContentType.AllowedTemplates
                         .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
-                        .ToDictionary(t => t.Alias, t => t.Name)))                
+                        .ToDictionary(t => t.Alias, t => t.Name)))
                 .ForMember(dest => dest.AllowedActions, opt => opt.ResolveUsing(src => actionButtonsResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
@@ -140,5 +141,5 @@ namespace Umbraco.Web.Models.Mapping
                 return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"(({source.Name}))";
             }
         }
-    }    
+    }
 }

From 0b9705ca3f44b73bb3cc7e9d2386a979abe9a5da Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jan 2019 15:13:10 +0100
Subject: [PATCH 77/84] Revert "Revert "Support IContentType.IsElement""

This reverts commit a5efc25c
---
 .../services/umbdataformatter.service.js      | 18 +++++++--------
 .../permissions/permissions.controller.js     | 22 +++++++------------
 .../views/permissions/permissions.html        | 20 +++++++++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  2 ++
 .../Umbraco/config/lang/en_us.xml             |  2 ++
 .../ContentTypeCompositionDisplay.cs          |  4 ++++
 .../Models/ContentEditing/ContentTypeSave.cs  |  3 +++
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index e31742e660..1e6fc5d643 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -64,7 +64,7 @@
                 var saveModel = _.pick(displayModel,
                     'compositeContentTypes', 'isContainer', 'allowAsRoot', 'allowedTemplates', 'allowedContentTypes',
                     'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
-                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant');
+                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
 
                 //TODO: Map these
                 saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
@@ -262,7 +262,7 @@
                     saveModel[props[m]] = startId.id;
                 }
 
-                saveModel.parentId = -1; 
+                saveModel.parentId = -1;
                 return saveModel;
             },
 
@@ -293,7 +293,7 @@
                 });
                 saveModel.email = propEmail.value.trim();
                 saveModel.username = propLogin.value.trim();
-                
+
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 
                 var selectedGroups = [];
@@ -336,7 +336,7 @@
 
             /** formats the display model used to display the media to the model used to save the media */
             formatMediaPostData: function (displayModel, action) {
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -354,7 +354,7 @@
             /** formats the display model used to display the content to the model used to save the content  */
             formatContentPostData: function (displayModel, action) {
 
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but 
+                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
                 // we don't want to post all of the data as it is unecessary.
                 var saveModel = {
                     id: displayModel.id,
@@ -379,7 +379,7 @@
                 var propExpireDate = displayModel.removeDate;
                 var propReleaseDate = displayModel.releaseDate;
                 var propTemplate = displayModel.template;
-            
+
                 saveModel.expireDate = propExpireDate ? propExpireDate : null;
                 saveModel.releaseDate = propReleaseDate ? propReleaseDate : null;
                 saveModel.templateAlias = propTemplate ? propTemplate : null;
@@ -389,8 +389,8 @@
 
             /**
              * This formats the server GET response for a content display item
-             * @param {} displayModel 
-             * @returns {} 
+             * @param {} displayModel
+             * @returns {}
              */
             formatContentGetData: function(displayModel) {
 
@@ -418,7 +418,7 @@
                             }
                         });
                     });
-                    
+
 
                     //now assign this same invariant property instance to the same index of the other variants property array
                     for (var j = 1; j < displayModel.variants.length; j++) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
index 4a7a870618..317fe094ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
@@ -25,6 +25,7 @@
         vm.removeChild = removeChild;
         vm.toggleAllowAsRoot = toggleAllowAsRoot;
         vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
+        vm.toggleIsElement = toggleIsElement;
 
         /* ---------- INIT ---------- */
 
@@ -84,25 +85,18 @@
            $scope.model.allowedContentTypes.splice(selectedChildIndex, 1);
         }
 
-        /**
-         * Toggle the $scope.model.allowAsRoot value to either true or false
-         */
-        function toggleAllowAsRoot(){
-            if($scope.model.allowAsRoot){
-                $scope.model.allowAsRoot = false;
-                return;
-            }
+        // note: "safe toggling" here ie handling cases where the value is undefined, etc
 
-            $scope.model.allowAsRoot = true;
+        function toggleAllowAsRoot() {
+            $scope.model.allowAsRoot = $scope.model.allowAsRoot ? false : true;
         }
 
         function toggleAllowCultureVariants() {
-            if ($scope.model.allowCultureVariant) {
-                $scope.model.allowCultureVariant = false;
-                return;
-            }
+            $scope.model.allowCultureVariant = $scope.model.allowCultureVariant ? false : true;
+        }
 
-            $scope.model.allowCultureVariant = true;
+        function toggleIsElement() {
+            $scope.model.isElement = $scope.model.isElement ? false : true;
         }
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
index ec1e528f8c..0d74c655d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
@@ -53,9 +53,25 @@
                                 hotkey="alt+shift+v">
                     </umb-toggle>
                 </div>
-    
+
             </div>
 
-        </umb-box-content>
+            <div class="sub-view-columns">
+
+                <div class="sub-view-column-left">
+                    <h5><localize key="contentTypeEditor_elementHeading" /></h5>
+                    <small><localize key="contentTypeEditor_elementDescription" /></small>
+                </div>
+
+                <div class="sub-view-column-right">
+                    <umb-toggle data-element="permissions-is-element"
+                                checked="model.isElement"
+                                on-click="vm.toggleIsElement()">
+                    </umb-toggle>
+                </div>
+
+            </div>
+
+            </umb-box-content>
     </umb-box>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 386d3af518..987203442a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1518,6 +1518,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</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 5de373f571..1860d3afc9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1559,6 +1559,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="variantsHeading">Allow varying by culture</key>
     <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
index 7211ddbf61..e5e74c2749 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs
@@ -26,6 +26,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        //Element
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         [DataMember(Name = "listViewEditorName")]
         [ReadOnly(true)]
         public string ListViewEditorName { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
index c2ec70d3dc..b1d24c5fd2 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
@@ -25,6 +25,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        [DataMember(Name = "isElement")]
+        public bool IsElement { get; set; }
+
         [DataMember(Name = "allowAsRoot")]
         public bool AllowAsRoot { get; set; }
 

From f9cd22d908ddfbfb09dd8ef0b6d033b1f32f18d1 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Tue, 15 Jan 2019 15:43:10 +0100
Subject: [PATCH 78/84] Added a comment explaining why we need the delay

---
 .../src/common/services/editor.service.js                     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index c495c4e7a1..721efe251c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -245,7 +245,9 @@ When building a custom infinite editor view you can use the same components as a
 
             // emit event to let components know an editor has been removed
             eventsService.emit("appState.editors.close", args);
-
+            
+            // delay required to map the properties to the correct editor due
+            // to another delay in the closing animation of the editor
             $timeout(function() {
                 // rebind keyboard shortcuts for the new editor in focus
                 rebindKeyboardShortcuts();

From 1bd5127bcf6d05b2f38a0c0121ae1e399c6ae63c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 17:27:18 +0100
Subject: [PATCH 79/84] Actually run HealthCheck notifier

---
 src/Umbraco.Web/Scheduling/SchedulerComponent.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index e4bc74b7f2..cd4f5ac933 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -149,6 +149,7 @@ namespace Umbraco.Web.Scheduling
 
             var periodInMilliseconds = healthCheckConfig.NotificationSettings.PeriodInHours * 60 * 60 * 1000;
             var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _runtime, logger);
+            _healthCheckRunner.TryAdd(task);
             return task;
         }
 

From 477075662163857ba32cea0a4989f1ab9438f7f4 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 18:41:02 +0100
Subject: [PATCH 80/84] Bugfix ContentCacheRefresher

---
 src/Umbraco.Web/Cache/ContentCacheRefresher.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index 22f1554269..b0192e9e75 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -44,16 +44,14 @@ namespace Umbraco.Web.Cache
 
         public override void Refresh(JsonPayload[] payloads)
         {
-            var runtimeCache = Current.ApplicationCache.RuntimeCache;
-
-            runtimeCache.ClearCacheObjectTypes<PublicAccessEntry>();
+            CacheHelper.RuntimeCache.ClearCacheObjectTypes<PublicAccessEntry>();
 
             var idsRemoved = new HashSet<int>();
+            var isolatedCache = CacheHelper.IsolatedRuntimeCache.GetOrCreateCache<IContent>();
 
             foreach (var payload in payloads)
             {
-                // remove that one
-                runtimeCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IContent>(payload.Id));
+                isolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IContent>(payload.Id));
 
                 _idkMap.ClearCache(payload.Id);
 
@@ -61,7 +59,7 @@ namespace Umbraco.Web.Cache
                 if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
                 {
                     var pathid = "," + payload.Id + ",";
-                    runtimeCache.ClearCacheObjectTypes<IContent>((k, v) => v.Path.Contains(pathid));
+                    isolatedCache.ClearCacheObjectTypes<IContent>((k, v) => v.Path.Contains(pathid));
                 }
 
                 //if the item is being completely removed, we need to refresh the domains cache if any domain was assigned to the content

From eb3d3e129c8a96583155239a85efacd1b825199f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 19:15:06 +0100
Subject: [PATCH 81/84] Bugfix package service

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

diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 8f6c287cf1..99ee7a098b 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -579,7 +579,7 @@ namespace Umbraco.Core.Services.Implement
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
 
             var isElement = infoElement.Element("IsElement");
-            if (isListView != null)
+            if (isElement != null)
                 contentType.IsElement = isElement.Value.InvariantEquals("true");
 
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set

From d4edbc8e791a9d944c737e0882b973672787147a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 Jan 2019 19:38:52 +0100
Subject: [PATCH 82/84] Fix tests

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

diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index ab65ac82b1..603464e18b 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -69,8 +69,9 @@ namespace Umbraco.Tests.PublishedContent
                 factory.CreatePropertyType("testRecursive", 1),
             };
             var compositionAliases = new[] { "MyCompositionAlias" };
-            var type = new AutoPublishedContentType(0, "anything", compositionAliases, propertyTypes);
-            ContentTypesCache.GetPublishedContentTypeByAlias = alias => type;
+            var anythingType = new AutoPublishedContentType(0, "anything", compositionAliases, propertyTypes);
+            var homeType = new AutoPublishedContentType(0, "home", compositionAliases, propertyTypes);
+            ContentTypesCache.GetPublishedContentTypeByAlias = alias => alias.InvariantEquals("home") ? homeType : anythingType;
         }
 
         protected override TypeLoader CreateTypeLoader(IRuntimeCacheProvider runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
@@ -236,6 +237,7 @@ namespace Umbraco.Tests.PublishedContent
         public void Is_Last_From_Where_Filter2()
         {
             var doc = GetNode(1173);
+            var ct = doc.ContentType;
 
             var items = doc.Children
                 .Select(x => x.CreateModel()) // linq, returns IEnumerable<IPublishedContent>
@@ -454,11 +456,11 @@ namespace Umbraco.Tests.PublishedContent
         {
             var doc = GetNode(1046); // has child nodes
 
-            var model = doc.FirstChild<Anything>(x => true); // predicate
+            var model = doc.FirstChild<Home>(x => true); // predicate
 
             Assert.IsNotNull(model);
             Assert.IsTrue(model.Id == 1173);
-            Assert.IsInstanceOf<Anything>(model);
+            Assert.IsInstanceOf<Home>(model);
             Assert.IsInstanceOf<IPublishedContent>(model);
 
             doc = GetNode(1175); // does not have child nodes

From 26b31f1fc88598bb1a201c55c4c06d269ceec438 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 16 Jan 2019 10:01:04 +0100
Subject: [PATCH 83/84] Fix Git repository issue with casing of some filepaths

---
 src/Umbraco.Web.UI/umbraco/config/lang/nb.xml |  963 -------------
 .../umbraco/config/lang/zh_tw.xml             | 1269 -----------------
 2 files changed, 2232 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
 delete mode 100644 src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
deleted file mode 100644
index d51d41e558..0000000000
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
+++ /dev/null
@@ -1,963 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<language alias="no" intName="Norwegian" localName="norsk" lcid="20" culture="nb-NO">
-  <creator>
-    <name>The Umbraco community</name>
-    <link>http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files</link>
-  </creator>
-  <area alias="actions">
-    <key alias="assignDomain">Angi domene</key>
-    <key alias="auditTrail">Revisjoner</key>
-    <key alias="browse">Bla gjennom</key>
-    <key alias="changeDocType">Skift dokumenttype</key>
-    <key alias="copy">Kopier</key>
-    <key alias="create">Opprett</key>
-    <key alias="createPackage">Opprett pakke</key>
-    <key alias="delete">Slett</key>
-    <key alias="disable">Deaktiver</key>
-    <key alias="emptyRecycleBin">Tøm papirkurv</key>
-    <key alias="exportDocumentType">Eksporter dokumenttype</key>
-    <key alias="importDocumentType">Importer dokumenttype</key>
-    <key alias="importPackage">Importer pakke</key>
-    <key alias="liveEdit">Rediger i Canvas</key>
-    <key alias="logout">Logg av</key>
-    <key alias="move">Flytt</key>
-    <key alias="notify">Varslinger</key>
-    <key alias="protect">Offentlig tilgang</key>
-    <key alias="publish">Publiser</key>
-    <key alias="unpublish">Avpubliser</key>
-    <key alias="refreshNode">Oppdater noder</key>
-    <key alias="republish">Republiser hele siten</key>
-    <key alias="restore" version="7.3.0">Gjenopprett</key>
-    <key alias="rights">Rettigheter</key>
-    <key alias="rollback">Reverser</key>
-    <key alias="sendtopublish">Send til publisering</key>
-    <key alias="sendToTranslate">Send til oversetting</key>
-    <key alias="sort">Sorter</key>
-    <key alias="translate">Oversett</key>
-    <key alias="update">Oppdater</key>
-  </area>
-  <area alias="assignDomain">
-    <key alias="permissionDenied">Ingen tilgang.</key>
-    <key alias="addNew">Legg til domene</key>
-    <key alias="remove">Fjern</key>
-    <key alias="invalidNode">Ugyldig node.</key>
-    <key alias="invalidDomain">Ugyldig domeneformat.</key>
-    <key alias="duplicateDomain">Domene er allerede tilknyttet.</key>
-    <key alias="language">Språk</key>
-    <key alias="domain">Domene</key>
-    <key alias="domainCreated">Domene '%0%' er nå opprettet og tilknyttet siden</key>
-    <key alias="domainDeleted">Domenet '%0%' er nå slettet</key>
-    <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="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>
-  </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">Viser for</key>
-  </area>
-  <area alias="buttons">
-    <key alias="select">Velg</key>
-    <key alias="somethingElse">Gjør noe annet</key>
-    <key alias="bold">Fet</key>
-    <key alias="deindent">Reduser innrykk</key>
-    <key alias="formFieldInsert">Sett inn skjemafelt</key>
-    <key alias="graphicHeadline">Sett inn grafisk overskrift</key>
-    <key alias="htmlEdit">Rediger HTML</key>
-    <key alias="indent">Øk innrykk</key>
-    <key alias="italic">Kursiv</key>
-    <key alias="justifyCenter">Midtstill</key>
-    <key alias="justifyLeft">Juster tekst venstre</key>
-    <key alias="justifyRight">Juster tekst høyre</key>
-    <key alias="linkInsert">Sett inn lenke</key>
-    <key alias="linkLocal">Sett inn lokal lenke (anker)</key>
-    <key alias="listBullet">Punktmerking</key>
-    <key alias="listNumeric">Nummerering</key>
-    <key alias="macroInsert">Sett inn makro</key>
-    <key alias="pictureInsert">Sett inn bilde</key>
-    <key alias="relations">Rediger relasjoner</key>
-    <key alias="returnToList">Tilbake til listen</key>
-    <key alias="save">Lagre</key>
-    <key alias="saveAndPublish">Lagre og publiser</key>
-    <key alias="saveAndSchedule">Lagre og planlegge</key>
-    <key alias="saveToPublish">Lagre og send til publisering</key>
-    <key alias="showPage">Forhåndsvis</key>
-    <key alias="showPageDisabled">Forhåndsvisning er deaktivert siden det ikke er angitt noen mal</key>
-    <key alias="styleChoose">Velg formattering</key>
-    <key alias="styleShow">Vis stiler</key>
-    <key alias="tableInsert">Sett inn tabell</key>
-  </area>
-  <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">For å endre det valge innholdets dokumenttype, velger du først en ny dokumenttype som er gyldig på gjeldende plassering.</key>
-    <key alias="changeDocTypeInstruction2">Kontroller deretter at alle egenskaper blir overført riktig til den nye dokumenttypen og klikk på Lagre.</key>
-    <key alias="contentRepublished">Innholdet har blitt republisert.</key>
-    <key alias="currentProperty">Nåværende egenskap</key>
-    <key alias="currentType">Nåværende type</key>
-    <key alias="docTypeCannotBeChanged">Du kan ikke endre dokumenttype, ettersom det ikke er andre gyldige dokumenttyper på denne plasseringen.</key>
-    <key alias="docTypeChanged">Dokumenttype endret</key>
-    <key alias="mapProperties">Overfør egenskaper</key>
-    <key alias="mapToProperty">Overfør til egenskap</key>
-    <key alias="newTemplate">Ny mal</key>
-    <key alias="newType">Ny type</key>
-    <key alias="none">ingen</key>
-    <key alias="selectedContent">Innhold</key>
-    <key alias="selectNewDocType">Velg ny dokumenttype</key>
-    <key alias="successMessage">Dokumenttypen på det valgte innhold ble endret til [new type], og følgende egenskaper ble overført:</key>
-    <key alias="to">til</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">Overføringen av egenskaper kunne ikke fullføres da en eller flere egenskaper er satt til å bli overført mer enn en gang.</key>
-    <key alias="validDocTypesNote">Kun andre dokumenttyper som er gyldige for denne plasseringen vises.</key>
-  </area>
-  <area alias="content">
-    <key alias="isPublished" version="7.2">Publisert</key>
-    <key alias="about">Om siden</key>
-    <key alias="alias">Alias</key>
-    <key alias="alternativeTextHelp">(hvordan du ville beskrevet bildet over telefon)</key>
-    <key alias="alternativeUrls">Alternative lenker</key>
-    <key alias="clickToEdit">Klikk for å redigere denne noden</key>
-    <key alias="createBy">Opprettet av</key>
-    <key alias="createByDesc" version="7.0">Opprinnelig forfatter</key>
-    <key alias="updatedBy" version="7.0">Oppdatert av</key>
-    <key alias="createDate">Opprettet den</key>
-    <key alias="createDateDesc" version="7.0">Tidspunkt for opprettelse</key>
-    <key alias="documentType">Dokumenttype</key>
-    <key alias="editing">Redigerer</key>
-    <key alias="expireDate">Utløpsdato</key>
-    <key alias="itemChanged">Denne noden er endret siden siste publisering</key>
-    <key alias="itemNotPublished">Denne noden er enda ikke publisert</key>
-    <key alias="lastPublished">Sist publisert</key>
-    <key alias="listViewNoItems" version="7.1.5">Det er ingen elementer å vise i listen.</key>
-    <key alias="mediatype">Mediatype</key>
-    <key alias="mediaLinks">Link til media</key>
-    <key alias="membergroup">Medlemsgruppe</key>
-    <key alias="memberrole">Rolle</key>
-    <key alias="membertype">Medlemstype</key>
-    <key alias="noDate">Ingen dato valgt</key>
-    <key alias="nodeName">Sidetittel</key>
-    <key alias="otherElements">Egenskaper</key>
-    <key alias="parentNotPublished">Dette dokumentet er publisert, men ikke synlig ettersom den overliggende siden '%0%' ikke er publisert</key>
-    <key alias="parentNotPublishedAnomaly">Intern feil: dokumentet er publisert men finnes ikke i hurtigbuffer</key>
-    <key alias="publish">Publisert</key>
-    <key alias="publishStatus">Publiseringsstatus</key>
-    <key alias="releaseDate">Publiseringsdato</key>
-    <key alias="unpublishDate">Dato for avpublisering</key>
-    <key alias="removeDate">Fjern dato</key>
-    <key alias="sortDone">Sorteringsrekkefølgen er oppdatert</key>
-    <key alias="sortHelp">Trekk og slipp nodene eller klikk på kolonneoverskriftene for å sortere. Du kan velge flere noder ved å holde shift eller control tastene mens du velger.</key>
-    <key alias="statistics">Statistikk</key>
-    <key alias="titleOptional">Tittel (valgfri)</key>
-    <key alias="altTextOptional">Alternativ tekst (valgfri)</key>
-    <key alias="type">Type</key>
-    <key alias="unpublish">Avpubliser</key>
-    <key alias="updateDate">Sist endret</key>
-    <key alias="updateDateDesc" version="7.0">Tidspunkt for siste endring</key>
-    <key alias="uploadClear">Fjern fil</key>
-    <key alias="urls">Lenke til dokument</key>
-    <key alias="memberof">Medlem av gruppe(ne)</key>
-    <key alias="notmemberof">Ikke medlem av gruppe(ne)</key>
-    <key alias="childItems" version="7.0">Undersider</key>
-    <key alias="target" version="7.0">Åpne i vindu</key>
-  </area>
-  <area alias="media">
-    <key alias="clickToUpload">Klikk for å laste opp</key>
-  </area>
-  <area alias="member">
-    <key alias="createNewMember">Opprett et nytt medlem</key>
-    <key alias="allMembers">Alle medlemmer</key>
-  </area>
-  <area alias="create">
-    <key alias="chooseNode">Hvor ønsker du å oprette den nye %0%</key>
-    <key alias="createUnder">Opprett under</key>
-    <key alias="updateData">Velg en type og skriv en tittel</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[Det er ingen tillatte dokumenttyper tilgjengelig. Du må tillate disse i innstillinger under <strong>"dokumenttyper"</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[Det er ingen tillatte mediatyper tilgjengelig. Du må tillate disse i innstillinger under <strong>"mediatyper"</strong>.]]></key>
-  </area>
-  <area alias="dashboard">
-    <key alias="browser">Til ditt nettsted</key>
-    <key alias="dontShowAgain">- Skjul</key>
-    <key alias="nothinghappens">Hvis Umbraco ikke starter, kan det skyldes at pop-up vinduer ikke er tillatt</key>
-    <key alias="openinnew">er åpnet i nytt vindu</key>
-    <key alias="restart">Omstart</key>
-    <key alias="visit">Besøk</key>
-    <key alias="welcome">Velkommen</key>
-  </area>
-  <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
-  </area>
-  <area alias="bulk">
-    <key alias="done">Done</key>
-    <key alias="deletedItem">Deleted %0% item</key>
-    <key alias="deletedItems">Deleted %0% items</key>
-    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
-    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
-    <key alias="publishedItem">Published %0% item</key>
-    <key alias="publishedItems">Published %0% items</key>
-    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
-    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
-    <key alias="unpublishedItem">Unpublished %0% item</key>
-    <key alias="unpublishedItems">Unpublished %0% items</key>
-    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
-    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
-    <key alias="movedItem">Moved %0% item</key>
-    <key alias="movedItems">Moved %0% items</key>
-    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
-    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
-    <key alias="copiedItem">Copied %0% item</key>
-    <key alias="copiedItems">Copied %0% items</key>
-    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
-    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
-  </area>
-  <area alias="defaultdialogs">
-    <key alias="anchorInsert">Navn på lokal link</key>
-    <key alias="assignDomain">Rediger domener</key>
-    <key alias="closeThisWindow">Lukk dette vinduet</key>
-    <key alias="confirmdelete">Er du sikker på at du vil slette</key>
-    <key alias="confirmdisable">Er du sikker på at du vil deaktivere</key>
-    <key alias="confirmlogout">Er du sikker på at du vil forlate Umbraco?</key>
-    <key alias="confirmSure">Er du sikker?</key>
-    <key alias="cut">Klipp ut</key>
-    <key alias="editdictionary">Rediger ordboksnøkkel</key>
-    <key alias="editlanguage">Rediger språk</key>
-    <key alias="insertAnchor">Sett inn lokal link</key>
-    <key alias="insertCharacter">Sett inn spesialtegn</key>
-    <key alias="insertgraphicheadline">Sett inn grafisk overskrift</key>
-    <key alias="insertimage">Sett inn bilde</key>
-    <key alias="insertlink">Sett inn lenke</key>
-    <key alias="insertMacro">Sett inn makro</key>
-    <key alias="inserttable">Sett inn tabell</key>
-    <key alias="lastEdited">Sist redigert</key>
-    <key alias="link">Lenke</key>
-    <key alias="linkinternal">Intern link:</key>
-    <key alias="linklocaltip">Ved lokal link, sett inn "#" foran link</key>
-    <key alias="linknewwindow">Åpne i nytt vindu?</key>
-    <key alias="macroContainerSettings">Makroinnstillinger</key>
-    <key alias="macroDoesNotHaveProperties">Denne makroen har ingen egenskaper du kan endre</key>
-    <key alias="paste">Lim inn</key>
-    <key alias="permissionsEdit">Endre rettigheter for</key>
-    <key alias="recycleBinDeleting">Innholdet i papirkurven blir nå slettet. Vennligst ikke lukk dette vinduet mens denne operasjonen foregår</key>
-    <key alias="recycleBinIsEmpty">Papirkurven er nå tom</key>
-    <key alias="recycleBinWarning">Når elementer blir slettet fra papirkurven vil de være slettet for alltid</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a> tjenesten opplever for tiden problemer som vi ikke har kontroll over. Vi beklager denne ubeleiligheten.]]></key>
-    <key alias="regexSearchHelp">Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code' 'url'</key>
-    <key alias="removeMacro">Fjern makro</key>
-    <key alias="requiredField">Obligatorisk</key>
-    <key alias="sitereindexed">Nettstedet er indeksert</key>
-    <key alias="siterepublished">Hurtigbufferen er blitt oppdatert. Alt publisert innhold er nå à jour. Alt upublisert innhold er fortsatt ikke publisert.</key>
-    <key alias="siterepublishHelp">Hurtigbufferen for siden vil bli oppdatert. Alt publisert innhold vil bli oppdatert, mens upublisert innhold vil forbli upublisert.</key>
-    <key alias="tableColumns">Antall kolonner</key>
-    <key alias="tableRows">Antall rader</key>
-    <key alias="templateContentAreaHelp"><![CDATA[<strong>Sett en plassholder-ID</strong><br/>Ved å sette en ID på plassholderen kan du legge inn innhold i denne malen fra underliggende maler, ved å referere denne ID'en ved hjelp av et <code>&lt;asp:content /&gt;</code> element.]]></key>
-    <key alias="templateContentPlaceHolderHelp"><![CDATA[<strong>Velg en plassholder ID</strong> fra listen under. Du kan bare velge ID'er fra den gjeldende malens overordnede mal.]]></key>
-    <key alias="thumbnailimageclickfororiginal">Klikk på bildet for å se det i full størrelse</key>
-    <key alias="treepicker">Velg punkt</key>
-    <key alias="viewCacheItem">Se buffret node</key>
-  </area>
-  <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[Rediger de forskjellige språkversjonene for ordbokelementet '<em>%0%</em>' under.<br/>Du kan legge til flere språk under 'språk' i menyen til venstre.]]></key>
-    <key alias="displayName">Språk</key>
-  </area>
-  <area alias="placeholders">
-    <key alias="username">Skriv inn ditt brukernavn</key>
-    <key alias="password">Skriv inn ditt passord</key>
-    <key alias="nameentity">Navngi %0%...</key>
-    <key alias="entername">Skriv inn navn...</key>
-    <key alias="search">Søk...</key>
-    <key alias="filter">Filtrer...</key>
-    <key alias="enterTags">Skriv inn nøkkelord (trykk på Enter etter hvert nøkkelord)...</key>
-  </area>
-  <area alias="editcontenttype">
-    <key alias="allowedchildnodetypes">Tillatte underordnede noder</key>
-    <key alias="create">Opprett</key>
-    <key alias="deletetab">Slett arkfane</key>
-    <key alias="description">Beskrivelse</key>
-    <key alias="newtab">Ny arkfane</key>
-    <key alias="tab">Arkfane</key>
-    <key alias="thumbnail">Miniatyrbilde</key>
-    <key alias="createListView" version="7.2">Opprett brukerdefinert listevisning</key>
-    <key alias="removeListView" version="7.2">Fjern brukerdefinert listevisning</key>
-  </area>
-  <area alias="editdatatype">
-    <key alias="addPrevalue">Legg til forhåndsverdi</key>
-    <key alias="dataBaseDatatype">Database datatype</key>
-    <key alias="guid">Kontrollelement GUID</key>
-    <key alias="renderControl">Kontrollelement</key>
-    <key alias="rteButtons">Knapper</key>
-    <key alias="rteEnableAdvancedSettings">Aktiver avanserte instillinger for</key>
-    <key alias="rteEnableContextMenu">Aktiver kontektsmeny</key>
-    <key alias="rteMaximumDefaultImgSize">Maksimum standard størrelse på innsatte bilder</key>
-    <key alias="rteRelatedStylesheets">Beslektede stilark</key>
-    <key alias="rteShowLabel">Vis etikett</key>
-    <key alias="rteWidthAndHeight">Bredde og høyde</key>
-  </area>
-  <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Dine data har blitt lagret, men før du kan publisere denne siden må du rette noen feil:</key>
-    <key alias="errorChangingProviderPassword">Den gjeldende Membership Provider støtter ikke endring av passord. (EnablePasswordRetrieval må være satt til sann)</key>
-    <key alias="errorExistsWithoutTab">%0% finnes allerede</key>
-    <key alias="errorHeader">Det var feil i dokumentet:</key>
-    <key alias="errorHeaderWithoutTab">Det var feil i skjemaet:</key>
-    <key alias="errorInPasswordFormat">Passordet bør være minst %0% tegn og inneholde minst %1% numeriske tegn</key>
-    <key alias="errorIntegerWithoutTab">%0% må være et heltall</key>
-    <key alias="errorMandatory">%0% under %1% er obligatorisk</key>
-    <key alias="errorMandatoryWithoutTab">%0% er obligatorisk</key>
-    <key alias="errorRegExp">%0% under %1% er ikke i et korrekt format</key>
-    <key alias="errorRegExpWithoutTab">%0% er ikke i et korrekt format</key>
-  </area>
-  <area alias="errors">
-    <key alias="dissallowedMediaType">Filtypen er deaktivert av administrator</key>
-    <key alias="codemirroriewarning">NB! Selv om CodeMirror er aktivert i konfigurasjon er det deaktivert i Internet Explorer pga. ustabilitet.</key>
-    <key alias="contentTypeAliasAndNameNotNull">Fyll ut både alias og navn på den nye egenskapstypen!</key>
-    <key alias="filePermissionsError">Det er et problem med lese/skrive rettighetene til en fil eller mappe</key>
-    <key alias="missingTitle">Tittel mangler</key>
-    <key alias="missingType">Type mangler</key>
-    <key alias="pictureResizeBiggerThanOrg">Du er i ferd med å gjøre bildet større enn originalen. Det vil forringe kvaliteten på bildet, ønsker du å fortsette?</key>
-    <key alias="startNodeDoesNotExists">Startnode er slettet. Kontakt din administrator</key>
-    <key alias="stylesMustMarkBeforeSelect">Du må markere innhold før du kan endre stil</key>
-    <key alias="stylesNoStylesOnPage">Det er ingen aktive stiler eller formateringer på denne siden</key>
-    <key alias="tableColMergeLeft">Sett markøren til venstre i de 2 cellene du ønsker å slå sammen</key>
-    <key alias="tableSplitNotSplittable">Du kan ikke dele en celle som allerede er delt.</key>
-  </area>
-  <area alias="general">
-    <key alias="about">Om</key>
-    <key alias="action">Handling</key>
-    <key alias="actions">Muligheter</key>
-    <key alias="add">Legg til</key>
-    <key alias="alias">Alias</key>
-    <key alias="areyousure">Er du sikker?</key>
-    <key alias="border">Ramme</key>
-    <key alias="by">av</key>
-    <key alias="cancel">Avbryt</key>
-    <key alias="cellMargin">Cellemargin</key>
-    <key alias="choose">Velg</key>
-    <key alias="close">Lukk</key>
-    <key alias="closewindow">Lukk vindu</key>
-    <key alias="comment">Kommentar</key>
-    <key alias="confirm">Bekreft</key>
-    <key alias="constrainProportions">Behold proposjoner</key>
-    <key alias="continue">Fortsett</key>
-    <key alias="copy">Kopier</key>
-    <key alias="create">Opprett</key>
-    <key alias="database">Database</key>
-    <key alias="date">Dato</key>
-    <key alias="default">Standard</key>
-    <key alias="delete">Slett</key>
-    <key alias="deleted">Slettet</key>
-    <key alias="deleting">Sletter...</key>
-    <key alias="design">Design</key>
-    <key alias="dimensions">Dimensjoner</key>
-    <key alias="down">Ned</key>
-    <key alias="download">Last ned</key>
-    <key alias="edit">Rediger</key>
-    <key alias="edited">Endret</key>
-    <key alias="elements">Elementer</key>
-    <key alias="email">E-post</key>
-    <key alias="error">Feil</key>
-    <key alias="findDocument">Finn</key>
-    <key alias="height">Høyde</key>
-    <key alias="help">Hjelp</key>
-    <key alias="icon">Ikon</key>
-    <key alias="import">Importer</key>
-    <key alias="innerMargin">Indre margin</key>
-    <key alias="insert">Sett inn</key>
-    <key alias="install">Installer</key>
-    <key alias="justify">Justering</key>
-    <key alias="language">Språk</key>
-    <key alias="layout">Layout</key>
-    <key alias="loading">Laster</key>
-    <key alias="locked">Låst</key>
-    <key alias="login">Logg inn</key>
-    <key alias="logoff">Logg ut</key>
-    <key alias="logout">Logg ut</key>
-    <key alias="macro">Makro</key>
-    <key alias="move">Flytt</key>
-    <key alias="name">Navn</key>
-    <key alias="new">Ny</key>
-    <key alias="next">Neste</key>
-    <key alias="no">Nei</key>
-    <key alias="of">av</key>
-    <key alias="ok">OK</key>
-    <key alias="open">Åpne</key>
-    <key alias="or">eller</key>
-    <key alias="password">Passord</key>
-    <key alias="path">Sti</key>
-    <key alias="placeHolderID">Plassholder ID</key>
-    <key alias="pleasewait">Ett øyeblikk...</key>
-    <key alias="previous">Forrige</key>
-    <key alias="properties">Egenskaper</key>
-    <key alias="reciept">E-post som innholdet i skjemaet skal sendes til</key>
-    <key alias="recycleBin">Papirkurv</key>
-    <key alias="remaining">Gjenværende</key>
-    <key alias="rename">Gi nytt navn</key>
-    <key alias="renew">Forny</key>
-    <key alias="required" version="7.0">Påkrevd</key>
-    <key alias="retry">Prøv igjen</key>
-    <key alias="rights">Rettigheter</key>
-    <key alias="search">Søk</key>
-    <key alias="server">Server</key>
-    <key alias="show">Vis</key>
-    <key alias="showPageOnSend">Hvilken side skal vises etter at skjemaet er sendt</key>
-    <key alias="size">Størrelse</key>
-    <key alias="sort">Sorter</key>
-    <key alias="submit">Send</key>
-    <key alias="type">Type</key>
-    <key alias="typeToSearch">Søk...</key>
-    <key alias="up">Opp</key>
-    <key alias="update">Oppdater</key>
-    <key alias="upgrade">Oppgrader</key>
-    <key alias="upload">Last opp</key>
-    <key alias="url">Url</key>
-    <key alias="user">Bruker</key>
-    <key alias="username">Brukernavn</key>
-    <key alias="value">Verdi</key>
-    <key alias="view">Visning</key>
-    <key alias="welcome">Velkommen...</key>
-    <key alias="width">Bredde</key>
-    <key alias="yes">Ja</key>
-    <key alias="folder">Mappe</key>
-    <key alias="searchResults">Søkeresultater</key>
-    <key alias="reorder">Sorter</key>
-    <key alias="reorderDone">Avslutt sortering</key>
-    <key alias="preview">Eksempel</key>
-    <key alias="changePassword">Bytt passord</key>
-    <key alias="to">til</key>
-    <key alias="listView">Listevisning</key>
-    <key alias="saving">Lagrer...</key>
-    <key alias="current">nåværende</key>
-    <key alias="embed">Innbygging</key>
-    <key alias="retrieve">Hent</key>
-    <key alias="selected">valgt</key>
-  </area>
-  <area alias="graphicheadline">
-    <key alias="backgroundcolor">Bakgrunnsfarge</key>
-    <key alias="bold">Fet</key>
-    <key alias="color">Tekstfarge</key>
-    <key alias="font">Skrifttype</key>
-    <key alias="text">Tekst</key>
-  </area>
-  <area alias="headers">
-    <key alias="page">Side</key>
-  </area>
-  <area alias="installer">
-    <key alias="databaseErrorCannotConnect">Installasjonsprogrammet kan ikke koble til databasen</key>
-    <key alias="databaseErrorWebConfig">Kunne ikke lagre Web.Config-filen. Vennligst endre databasens tilkoblingsstreng manuelt. </key>
-    <key alias="databaseFound">Din database er funnet og identifisert som</key>
-    <key alias="databaseHeader">Databasekonfigurasjon</key>
-    <key alias="databaseInstall"><![CDATA[Klikk <strong>installer</strong>-knappen for å installere Umbraco %0% databasen]]></key>
-    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% har nå blitt kopiert til din database. Trykk <strong>Neste</strong> for å fortsette.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mer informasjon om redigering av web.config her.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[For å fullføre dette steget, må du vite en del informasjon om din database server ("tilkoblingsstreng").<br/> Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[<p> Trykk på knappen <strong>oppgrader</strong> for å oppgradere databasen din til Umbraco %0%</p> <p> Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå! </p>]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Databasen din har blitt oppgradert til den siste utgaven, %0%.<br/>Trykk <strong>Neste</strong> for å fortsette.]]></key>
-    <key alias="databaseUpToDate"><![CDATA[Databasen din er av nyeste versjon! Klikk <strong>neste</strong> for å fortsette konfigurasjonsveiviseren]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>Passordet til standardbrukeren må endres!]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<strong>Standardbrukeren har blitt deaktivert eller har ingen tilgang til Umbraco!</strong></p><p>Ingen videre handling er nødvendig. Klikk <b>neste</b> for å fortsette.]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<strong>Passordet til standardbrukeren har blitt forandret etter installasjonen!</strong></p><p>Ingen videre handling er nødvendig. Klikk <strong>Neste</strong> for å fortsette.]]></key>
-    <key alias="defaultUserPasswordChanged">Passordet er blitt endret!</key>
-    <key alias="greatStart">Få en god start med våre introduksjonsvideoer</key>
-    <key alias="licenseText">Ved å klikke på Neste-knappen (eller endre UmbracoConfigurationStatus i Web.config), godtar du lisensen for denne programvaren som angitt i boksen nedenfor. Legg merke til at denne Umbraco distribusjon består av to ulike lisenser, åpen kilde MIT lisens for rammen og Umbraco frivareverktøy lisens som dekker brukergrensesnittet.</key>
-    <key alias="None">Ikke installert.</key>
-    <key alias="permissionsAffectedFolders">Berørte filer og mapper</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">Mer informasjon om å sette opp rettigheter for Umbraco her</key>
-    <key alias="permissionsAffectedFoldersText">Du må gi ASP.NET brukeren rettigheter til å endre de følgende filer og mapper</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Rettighetene er nesten perfekt satt opp!</strong><br/><br/> Du kan kjøre Umbraco uten problemer, men du vil ikke være i stand til å installere de anbefalte pakkene for å utnytte Umbraco fullt ut.]]></key>
-    <key alias="permissionsHowtoResolve">Hvordan løse problemet</key>
-    <key alias="permissionsHowtoResolveLink">Klikk her for å lese tekstversjonen</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[Se vår <strong>innføringsvideo</strong> om å sette opp rettigheter for Umbraco eller les tekstversjonen.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Rettighetsinnstillingene kan være et problem!</strong><br/><br/> Du kan kjøre Umbraco uten problemer, men du vil ikke være i stand til å installere de anbefalte pakkene for å utnytte Umbraco fullt ut.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Rettighetsinstillingene er ikke klargjort for Umbraco!</strong><br/><br/> For å kunne kjøre Umbraco, må du oppdatere rettighetsinnstillingene dine.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Rettighetsinnstillingene er perfekt!</strong><br/><br/>Du er klar for å kjøre Umbraco og installere pakker!]]></key>
-    <key alias="permissionsResolveFolderIssues">Løser mappeproblem</key>
-    <key alias="permissionsResolveFolderIssuesLink">Følg denne linken for mer informasjon om problemer med ASP.NET og oppretting av mapper</key>
-    <key alias="permissionsSettingUpPermissions">Konfigurerer mappetillatelser</key>
-    <key alias="permissionsText"><![CDATA[Umbraco trenger skrive/endre tilgang til enkelte mapper for å kunne lagre filer som bilder og PDF-dokumenter. Den lagrer også midlertidig data (aka: hurtiglager) for å øke ytelsen på websiden din.]]></key>
-    <key alias="runwayFromScratch">Jeg ønsker å starte fra bunnen.</key>
-    <key alias="runwayFromScratchText"><![CDATA[Din website er helt tom for øyeblikket. Dette er perfekt hvis du vil begynne helt forfra og lage dine egne dokumenttyper og maler. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan fortsatt velge å installere Runway senere. Vennligst gå til Utvikler-seksjonen og velg Pakker.]]></key>
-    <key alias="runwayHeader">Du har akkurat satt opp en ren Umbraco plattform. Hva vil du gjøre nå?</key>
-    <key alias="runwayInstalled">Runway er installert</key>
-    <key alias="runwayInstalledText"><![CDATA[Du har nå fundamentet på plass. Velg hvilke moduler du ønsker å installer på toppen av det.<br/> Dette er vår liste av anbefalte moduler- Kryss av de du ønsker å installere, eller se den<a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulle listen av moduler</a> ]]></key>
-    <key alias="runwayOnlyProUsers">Bare anbefalt for erfarne brukere</key>
-    <key alias="runwaySimpleSite">Jeg vil starte med en enkel webside</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[<p> "Runway" er en enkel webside som utstyrer deg med noen grunnleggende dokumenttyper og maler. Veiviseren kan sette opp Runway for deg automatisk, men du kan enkelt endre, utvide eller slette den. Runway er ikke nødvendig, og du kan enkelt bruke Umbraco uten den. Imidlertidig tilbyr Runway et enkelt fundament basert på de beste metodene for å hjelpe deg i gang fortere enn noensinne. Hvis du velger å installere Runway, kan du også velge blant grunnleggende byggeklosser kalt Runway Moduler for å forøke dine Runway-sider. </p> <small> <em>Sider inkludert i Runway:</em> Hjemmeside, Komme-i-gang, Installere moduler.<br /> <em>Valgfrie Moduler:</em> Toppnavigasjon, Sidekart, Kontakt, Galleri. </small> ]]></key>
-    <key alias="runwayWhatIsRunway">Hva er Runway</key>
-    <key alias="step1">Steg 1/5 Godta lisens</key>
-    <key alias="step2">Steg 2/5 Database konfigurasjon</key>
-    <key alias="step3">Steg 3/5: Valider filrettigheter</key>
-    <key alias="step4">Steg 4/5: Skjekk Umbraco sikkerheten</key>
-    <key alias="step5">Steg 5/5: Umbraco er klar for deg til å starte!</key>
-    <key alias="thankYou">Tusen takk for at du valgte Umbraco!</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Se ditt nye nettsted</h3> Du har installert Runway, hvorfor ikke se hvordan ditt nettsted ser ut.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Mer hjelp og info</h3> Få hjelp fra vårt prisbelønte samfunn, bla gjennom dokumentasjonen eller se noen gratis videoer på hvordan man bygger et enkelt nettsted, hvordan bruke pakker og en rask guide til Umbraco terminologi]]></key>
-    <key alias="theEndHeader">Umbraco %0% er installert og klar til bruk</key>
-    <key alias="theEndInstallFailed"><![CDATA[For å fullføre installasjonen, må du manuelt endre <strong>web.config</strong> filen, og oppdatere AppSetting-nøkkelen <strong>UmbracoConfigurationStatus</strong> til verdien <strong>'%0%'</strong>]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>starte øyeblikkelig</strong> ved å klikke på "Start Umbraco" knappen nedenfor. <br/>Hvis du er <strong>ny på Umbraco</strong>, kan du finne mange ressurser på våre komme-i-gang sider.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Start Umbraco</h3> For å administrere din webside, åpne Umbraco og begynn å legge til innhold, oppdatere maler og stilark eller utvide funksjonaliteten]]></key>
-    <key alias="Unavailable">Tilkobling til databasen mislyktes.</key>
-    <key alias="Version3">Umbraco Versjon 3</key>
-    <key alias="Version4">Umbraco Versjon 4</key>
-    <key alias="watch">Se</key>
-    <key alias="welcomeIntro"><![CDATA[Denne veiviseren vil hjelpe deg gjennom prosessen med å konfigurere <strong>Umbraco %0%</strong> for en ny installasjon eller oppgradering fra versjon 3.0. <br/><br/> Trykk <strong>"neste"</strong> for å starte veiviseren.]]></key>
-  </area>
-  <area alias="language">
-    <key alias="cultureCode">Språkkode</key>
-    <key alias="displayName">Språk</key>
-  </area>
-  <area alias="lockout">
-    <key alias="lockoutWillOccur">Du har vært inaktiv og vil logges ut automatisk om</key>
-    <key alias="renewSession">Forny innlogging for å lagre</key>
-  </area>
-  <area alias="login">
-    <key alias="greeting0">Da er det søndag!</key>
-    <key alias="greeting1">Smil, det er mandag!</key>
-    <key alias="greeting2">Hurra, det er tirsdag!</key>
-    <key alias="greeting3">For en herlig onsdag!</key>
-    <key alias="greeting4">Gledelig torsdag!</key>
-    <key alias="greeting5">Endelig fredag!</key>
-    <key alias="greeting6">Gledelig lørdag</key>
-    <key alias="instruction">Logg på nedenfor</key>
-    <key alias="signInWith">Logg på med</key>
-    <key alias="timeout">Din sesjon er utløpt</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
-  </area>
-  <area alias="main">
-    <key alias="dashboard">Skrivebord</key>
-    <key alias="sections">Seksjoner</key>
-    <key alias="tree">Innhold</key>
-  </area>
-  <area alias="moveOrCopy">
-    <key alias="choose">Velg side over...</key>
-    <key alias="copyDone">%0% er nå kopiert til %1%</key>
-    <key alias="copyTo">Kopier til</key>
-    <key alias="moveDone">%0% er nå flyttet til %1%</key>
-    <key alias="moveTo">Flytt til</key>
-    <key alias="nodeSelected">har blitt valgt som rot til ditt nye innhold, klikk 'ok' nedenfor.</key>
-    <key alias="noNodeSelected">Ingen node er valgt, vennligst velg en node i listen over før du klikker 'fortsett'</key>
-    <key alias="notAllowedByContentType">Gjeldende nodes type tillates ikke under valgt node</key>
-    <key alias="notAllowedByPath">Gjeldende node kan ikke legges under en underordnet node</key>
-    <key alias="notAllowedAtRoot">Denne noden kan ikke ligge på rotnivå</key>
-    <key alias="notValid">Handlingen tillates ikke. Du mangler tilgang til en eller flere underordnede noder.</key>
-    <key alias="relateToOriginal">Relater kopierte elementer til original(e)</key>
-  </area>
-  <area alias="notifications">
-    <key alias="editNotifications">Rediger dine varsler for %0%</key>
-    <key alias="mailBody"><![CDATA[
-Hei %0%
-
-Dette er en automatisk mail for å informere om at handlingen '%1%'
-er utført på siden '%2%'
-av brukeren '%3%'
-
-Gå til http://%4%/Umbraco/default.aspx?section=content&id=%5% for å redigere.
-
-Ha en fin dag!
-
-Vennlig hilsen Umbraco roboten
-    ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hei %0%</p>
-
-		  <p>Dette er en automatisk mail for å informere om at handlingen '%1%'
-        er blitt utført på siden <a href="http://%4%/actions/preview.aspx?id=%5%"><strong>'%2%'</strong></a>
-        av brukeren <strong>'%3%'</strong>
-	    </p>
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/Umbraco/actions/editContent.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;REDIGER&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-		  <p>
-			  <h3>Rettelser:</h3>
-			  <table style="width: 100%;">
-						   %6%
-				</table>
-			 </p>
-
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/Umbraco/actions/editContent.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;REDIGER&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-
-		  <p>Ha en fin dag!<br /><br />
-			  Vennlig hilsen Umbraco roboten
-		  </p>]]></key>
-    <key alias="mailSubject">[%0%] Varsling om %1% utført på %2%</key>
-    <key alias="notifications">Varslinger</key>
-  </area>
-  <area alias="packager">
-    <key alias="chooseLocalPackageText"><![CDATA[Klikk browse og velg pakke fra lokal disk.<br/> Umbraco-pakker har vanligvis endelsen ".umb" eller ".zip".]]></key>
-    <key alias="packageAuthor">Utvikler</key>
-    <key alias="packageDemonstration">Demonstrasjon</key>
-    <key alias="packageDocumentation">Dokumentasjon</key>
-    <key alias="packageMetaData">Metadata</key>
-    <key alias="packageName">Pakkenavn</key>
-    <key alias="packageNoItemsHeader">Pakken inneholder ingen elementer</key>
-    <key alias="packageNoItemsText"><![CDATA[Denne pakkefilen inneholder ingen elementer å avinstallere.<br/><br/>Du kan trygt fjerne pakken fra systemet ved å klikke "avinstaller pakke" nedenfor.]]></key>
-    <key alias="packageNoUpgrades">Ingen oppdateringer tilgjengelig</key>
-    <key alias="packageOptions">Alternativer for pakke</key>
-    <key alias="packageReadme">Lesmeg for pakke</key>
-    <key alias="packageRepository">Pakkebrønn</key>
-    <key alias="packageUninstallConfirm">Bekreft avinstallering</key>
-    <key alias="packageUninstalledHeader">Pakken ble avinstallert</key>
-    <key alias="packageUninstalledText">Pakken ble vellykket avinstallert</key>
-    <key alias="packageUninstallHeader">Avinstaller pakke</key>
-    <key alias="packageUninstallText"><![CDATA[Du kan velge bort elementer du ikke vil slette på dette tidspunkt, nedenfor. Når du klikker "bekreft avinstallering" vil alle elementer som er krysset av bli slettet.<br/> <span style="color:red;font-weight:bold;">Advarsel:</span> alle dokumenter, media, etc. som som er avhengig av elementene du sletter, vil slutte å virke, noe som kan føre til ustabilitet, så avinstaller med forsiktighet. Hvis du er i tvil, kontakt pakkeutvikleren.]]></key>
-    <key alias="packageUpgradeDownload">Last ned oppdatering fra pakkeregisteret</key>
-    <key alias="packageUpgradeHeader">Oppgrader pakke</key>
-    <key alias="packageUpgradeInstructions">Oppgraderingsinstrukser</key>
-    <key alias="packageUpgradeText">Det er en oppdatering tilgjengelig for denne pakken. Du kan laste den ned direkte fra pakkebrønnen.</key>
-    <key alias="packageVersion">Pakkeversjon</key>
-    <key alias="packageVersionHistory">Pakkeversjonshistorie</key>
-    <key alias="viewPackageWebsite">Se pakkens nettsted</key>
-  </area>
-  <area alias="paste">
-    <key alias="doNothing">Lim inn med full formattering (Anbefales ikke)</key>
-    <key alias="errorMessage">Teksten du er i ferd med å lime inn, inneholder spesialtegn eller formattering. Dette kan skyldes at du kopierer fra f.eks. Microsoft Word. Umbraco kan fjerne denne spesialformatteringen automatisk slik at innholdet er mer velegnet for visning på en webside.</key>
-    <key alias="removeAll">Lim inn som ren tekst, dvs. fjern al formattering</key>
-    <key alias="removeSpecialFormattering">Lim inn og fjern uegnet formatering (anbefalt)</key>
-  </area>
-  <area alias="publicAccess">
-    <key alias="paAdvanced">Avansert: Beskytt ved å velge hvilke brukergrupper som har tilgang til siden</key>
-    <key alias="paAdvancedHelp"><![CDATA[Om du ønsker å kontrollere tilgang til siden ved å bruke rolle-basert autentisering,<br /> ved å bruke Umbraco's medlems-grupper]]></key>
-    <key alias="paAdvancedNoGroups">Du må opprette en medlemsgruppe før du kan bruke rollebasert autentikasjon.</key>
-    <key alias="paErrorPage">Feilside</key>
-    <key alias="paErrorPageHelp">Brukt når personer logger på, men ikke har tilgang</key>
-    <key alias="paHowWould">Hvordan vil du beskytte siden din?</key>
-    <key alias="paIsProtected">%0% er nå beskyttet</key>
-    <key alias="paIsRemoved">Beskyttelse fjernet fra %0%</key>
-    <key alias="paLoginPage">Innloggingsside</key>
-    <key alias="paLoginPageHelp">Velg siden som har loginformularet</key>
-    <key alias="paRemoveProtection">Fjern beskyttelse</key>
-    <key alias="paSelectPages">Velg sidene som inneholder login-skjema og feilmelding ved feil innolgging.</key>
-    <key alias="paSelectRoles">Velg rollene som har tilgang til denne siden</key>
-    <key alias="paSetLogin">Sett brukernavn og passord for denne siden</key>
-    <key alias="paSimple">Enkelt: Beskytt ved hjelp av brukernavn og passord</key>
-    <key alias="paSimpleHelp">Om du ønsker å bruke enkel autentisering via ett enkelt brukernavn og passord</key>
-  </area>
-  <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease">%0% kunne ikke publiseres fordi den har planlagt utgivelsesdato.</key>
-    <key alias="contentPublishedFailedInvalid">%0% ble ikke publisert. Ett eller flere felter ble ikke godkjent av validering.</key>
-    <key alias="contentPublishedFailedByEvent">%0% kunne ikke publiseres fordi et tredjepartstillegg avbrøt handlingen.</key>
-    <key alias="contentPublishedFailedByParent">%0% kan ikke publiseres fordi en overordnet side ikke er publisert.</key>
-    <key alias="includeUnpublished">Inkluder upubliserte undersider</key>
-    <key alias="inProgress">Publiserer - vennligst vent...</key>
-    <key alias="inProgressCounter">%0% av %1% sider har blitt publisert...</key>
-    <key alias="nodePublish">%0% er nå publisert</key>
-    <key alias="nodePublishAll">%0% og alle undersider er nå publisert</key>
-    <key alias="publishAll">Publiser alle undersider</key>
-    <key alias="publishHelp"><![CDATA[Klikk <em>ok</em> for å publisere <strong>%0%</strong> og dermed gjøre innholdet synlig for alle.<br/><br />Du kan publisere denne siden og alle dens undersider ved å krysse av <em>Publiser alle undersider</em> nedenfor.]]></key>
-  </area>
-  <area alias="colorpicker">
-    <key alias="noColors">Du har ikke konfigurert noen godkjente farger</key>
-  </area>
-  <area alias="relatedlinks">
-    <key alias="enterExternal">skriv inn ekstern lenke</key>
-    <key alias="chooseInternal">velg en intern side</key>
-    <key alias="caption">Tittel</key>
-    <key alias="link">Lenke</key>
-    <key alias="newWindow">Åpne i nytt vindu</key>
-    <key alias="captionPlaceholder">Skriv inn en tekst</key>
-    <key alias="externalLinkPlaceholder">Skriv inn en lenke</key>
-  </area>
-  <area alias="imagecropper">
-    <key alias="reset">Nullstill</key>
-  </area>
-  <area alias="rollback">
-    <key alias="currentVersion">Gjeldende versjon</key>
-    <key alias="diffHelp"><![CDATA[Dette viser forskjellene mellom den gjeldende og den valgte versjonen<br /><del>Rød</del> tekst vil ikke bli vist i den valgte versjonen. , <ins>grønn betyr lagt til</ins>]]></key>
-    <key alias="documentRolledBack">Dokumentet er tilbakeført til en tidligere versjon</key>
-    <key alias="htmlHelp">Dette viser den valgte versjonen som HTML, bruk avviksvisningen hvis du ønsker å se forksjellene mellom to versjoner samtidig.</key>
-    <key alias="rollbackTo">Tilbakefør til</key>
-    <key alias="selectVersion">Velg versjon</key>
-    <key alias="view">Vis</key>
-  </area>
-  <area alias="scripts">
-    <key alias="editscript">Rediger scriptfilen</key>
-  </area>
-  <area alias="sections">
-    <key alias="concierge">Concierge</key>
-    <key alias="content">Innhold</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">Utvikler</key>
-    <key alias="installer">Umbraco konfigurasjonsveiviser</key>
-    <key alias="media">Mediaarkiv</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="newsletters">Nyhetsbrev</key>
-    <key alias="settings">Innstillinger</key>
-    <key alias="statistics">Statistikk</key>
-    <key alias="translation">Oversettelse</key>
-    <key alias="users">Brukere</key>
-    <key alias="help" version="7.0">Hjelp</key>
-    <key alias="forms">Skjemaer</key>
-  </area>
-  <area alias="help">
-    <key alias="theBestUmbracoVideoTutorials">De beste Umbraco opplæringsvideoer</key>
-  </area>
-  <area alias="settings">
-    <key alias="defaulttemplate">Standardmal</key>
-    <key alias="dictionary editor egenskab">Ordboksnøkkel</key>
-    <key alias="importDocumentTypeHelp">For å importere en dokumenttype, finn ".udt" filen på datamaskinen din ved å klikke "Utforsk" knappen og klikk "Importer" (du vil bli spurt om bekreftelse i det neste skjermbildet)</key>
-    <key alias="newtabname">Ny tittel på arkfane</key>
-    <key alias="nodetype">Nodetype</key>
-    <key alias="objecttype">Type</key>
-    <key alias="stylesheet">Stilark</key>
-    <key alias="script">Script</key>
-    <key alias="stylesheet editor egenskab">Stilark-egenskap</key>
-    <key alias="tab">Arkfane</key>
-    <key alias="tabname">Tittel på arkfane</key>
-    <key alias="tabs">Arkfaner</key>
-    <key alias="contentTypeEnabled">Hovedinnholdstype aktivert</key>
-    <key alias="contentTypeUses">Denne dokumenttypen bruker</key>
-    <key alias="asAContentMasterType">som hoveddokumenttype. Arkfaner fra hoveddokumenttyper vises ikke og kan kun endres på hoveddokumenttypen selv.</key>
-    <key alias="noPropertiesDefinedOnTab">Ingen egenskaper definert i denne arkfanen. Klikk på "legg til ny egenskap" lenken i toppen for å opprette en ny egenskap.</key>
-  </area>
-  <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
-    <key alias="sortDone">Sortering ferdig.</key>
-    <key alias="sortHelp">Dra elementene opp eller ned for å arrangere dem. Du kan også klikke kolonneoverskriftene for å sortere alt på en gang.</key>
-    <key alias="sortPleaseWait"><![CDATA[Vennligst vent. Elementene blir sortert, dette kan ta litt tid.]]></key>
-  </area>
-  <area alias="speechBubbles">
-    <key alias="operationFailedHeader">En feil oppsto</key>
-    <key alias="invalidUserPermissionsText">Utilstrekkelige brukertillatelser, kunne ikke fullføre operasjonen</key>
-    <key alias="operationCancelledHeader">Avbrutt</key>
-    <key alias="operationCancelledText">Handlingen ble avbrutt av et tredjepartstillegg</key>
-    <key alias="contentPublishedFailedByEvent">Publisering ble avbrutt av et tredjepartstillegg</key>
-    <key alias="contentTypeDublicatePropertyType">Egenskaptypen finnes allerede</key>
-    <key alias="contentTypePropertyTypeCreated">Egenskapstype opprettet</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Navn: %0% <br /> DataType: %1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">Egenskapstype slettet</key>
-    <key alias="contentTypeSavedHeader">Innholdstype lagret</key>
-    <key alias="contentTypeTabCreated">Du har opprettet en arkfane</key>
-    <key alias="contentTypeTabDeleted">Arkfane slettet</key>
-    <key alias="contentTypeTabDeletedText">Arkfane med id: %0% slettet</key>
-    <key alias="cssErrorHeader">Stilarket ble ikke lagret</key>
-    <key alias="cssSavedHeader">Stilarket ble lagret</key>
-    <key alias="cssSavedText">Stilark lagret uten feil</key>
-    <key alias="dataTypeSaved">Datatype lagret</key>
-    <key alias="dictionaryItemSaved">Ordbokelement lagret</key>
-    <key alias="editContentPublishedFailedByParent">Publiseringen feilet fordi den overliggende siden ikke er publisert</key>
-    <key alias="editContentPublishedHeader">Innhold publisert</key>
-    <key alias="editContentPublishedText">og er nå synlig for besøkende</key>
-    <key alias="editContentSavedHeader">Innhold lagret</key>
-    <key alias="editContentSavedText">Husk å publisere for å gjøre endringene synlig for besøkende</key>
-    <key alias="editContentSendToPublish">Sendt for godkjenning</key>
-    <key alias="editContentSendToPublishText">Endringer har blitt sendt til godkjenning</key>
-    <key alias="editMediaSaved">Media lagret</key>
-    <key alias="editMediaSavedText">Media lagret uten feil</key>
-    <key alias="editMemberSaved">Medlem lagret</key>
-    <key alias="editStylesheetPropertySaved">Stilarksegenskap lagret</key>
-    <key alias="editStylesheetSaved">Stilark lagret</key>
-    <key alias="editTemplateSaved">Mal lagret</key>
-    <key alias="editUserError">Feil ved lagring av bruker (sjekk loggen)</key>
-    <key alias="editUserSaved">Bruker lagret</key>
-    <key alias="editUserTypeSaved">Brukertypen lagret</key>
-    <key alias="fileErrorHeader">Filen ble ikke lagret</key>
-    <key alias="fileErrorText">Filen kunne ikke lagres. Vennligst sjekk filrettigheter</key>
-    <key alias="fileSavedHeader">Filen ble lagret</key>
-    <key alias="fileSavedText">Filen ble lagret uten feil</key>
-    <key alias="languageSaved">Språk lagret</key>
-    <key alias="templateErrorHeader">Malen ble ikke lagret</key>
-    <key alias="templateErrorText">Vennligst forviss deg om at du ikke har to maler med samme alias</key>
-    <key alias="templateSavedHeader">Malen ble lagret</key>
-    <key alias="templateSavedText">Malen ble lagret uten feil!</key>
-    <key alias="contentUnpublished">Innhold avpublisert</key>
-    <key alias="partialViewSavedHeader">Delmal lagret</key>
-    <key alias="partialViewSavedText">Delmal lagret uten feil</key>
-    <key alias="partialViewErrorHeader">Delmal ble ikke lagret!</key>
-    <key alias="partialViewErrorText">En feil oppsto ved lagring av delmal</key>
-  </area>
-  <area alias="stylesheet">
-    <key alias="aliasHelp">Bruk CSS syntaks f.eks: h1, .redHeader, .blueText</key>
-    <key alias="editstylesheet">Rediger stilark</key>
-    <key alias="editstylesheetproperty">Rediger egenskap for stilark</key>
-    <key alias="nameHelp">Navn for å identifisere stilarksegenskapen i rik-tekst editoren</key>
-    <key alias="preview">Forhåndsvis</key>
-    <key alias="styles">Stiler</key>
-  </area>
-  <area alias="template">
-    <key alias="edittemplate">Rediger mal</key>
-    <key alias="insertContentArea">Sett inn innholdsområde</key>
-    <key alias="insertContentAreaPlaceHolder">Sett inn plassholder for innholdsområde</key>
-    <key alias="insertDictionaryItem">Sett inn ordbokselement</key>
-    <key alias="insertMacro">Sett inn makro</key>
-    <key alias="insertPageField">Sett inn Umbraco sidefelt</key>
-    <key alias="mastertemplate">Hovedmal</key>
-    <key alias="quickGuide">Hurtigguide til Umbraco sine maltagger</key>
-    <key alias="template">Mal</key>
-  </area>
-  <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Sett inn element</key>
-    <key alias="chooseLayout">Velg layout</key>
-    <key alias="addRows">Legg til rad</key>
-    <key alias="addElement">Legg til innhold</key>
-    <key alias="dropElement">Slipp innhold</key>
-    <key alias="settingsApplied">Raden har tilpasset design</key>
-    <key alias="contentNotAllowed">Innholdstypen er ikke tillatt her</key>
-    <key alias="contentAllowed">Innholdstypen er tillatt her</key>
-    <key alias="clickToEmbed">Klikk for å bygge inn</key>
-    <key alias="clickToInsertImage">Klikk for å sette inn et bilde</key>
-    <key alias="placeholderImageCaption">Bildetekst...</key>
-    <key alias="placeholderWriteHere">Skriv her...</key>
-    <key alias="gridLayouts">Rutenettoppsett</key>
-    <key alias="gridLayoutsDetail">Et oppsett er det overordnede arbeidsområdet til ditt rutenett - du vil typisk kun behøve ett eller to</key>
-    <key alias="addGridLayout">Legg til rutenettoppsett</key>
-    <key alias="addGridLayoutDetail">Juster oppsettet ved å konfigurere kolonnebredder og legge til ytterligere seksjoner</key>
-    <key alias="rowConfigurations">Radkonfigurasjoner</key>
-    <key alias="rowConfigurationsDetail">Rader er forhåndsdefinerte celler arrangert vannrett</key>
-    <key alias="addRowConfiguration">Legg til radkonfigurasjon</key>
-    <key alias="addRowConfigurationDetail">Juster raden ved å sette cellebredder og legge til flere celler</key>
-    <key alias="columns">Kolonner</key>
-    <key alias="columnsDetails">Totalt antall kolonner i rutenettet</key>
-    <key alias="settings">Innstillinger</key>
-    <key alias="settingsDetails">Konfigurer hvilke innstillinger brukeren kan endre</key>
-    <key alias="styles">Stiler</key>
-    <key alias="stylesDetails">Konfigurer hvilke stiler redaktørene kan endre</key>
-    <key alias="allowAllEditors">Tillatt alle editorer</key>
-    <key alias="allowAllRowConfigurations">Tillat alle radkonfigurasjoner</key>
-    <key alias="setAsDefault">Bruk som standard</key>
-    <key alias="chooseExtra">Velg ekstra</key>
-    <key alias="chooseDefault">Velg standard</key>
-    <key alias="areAdded">er lagt til</key>
-  </area>
-  <area alias="templateEditor">
-    <key alias="alternativeField">Alternativt felt</key>
-    <key alias="alternativeText">Alternativ tekst</key>
-    <key alias="casing">Store/små bokstaver</key>
-    <key alias="encoding">Encoding</key>
-    <key alias="chooseField">Felt som skal settes inn</key>
-    <key alias="convertLineBreaks">Konverter linjeskift</key>
-    <key alias="convertLineBreaksHelp">Erstatter et linjeskift med htmltaggen &lt;br&gt;</key>
-    <key alias="customFields">Egendefinerte felt</key>
-    <key alias="dateOnly">Ja, kun dato</key>
-    <key alias="formatAsDate">Formatter som dato</key>
-    <key alias="htmlEncode">HTML koding</key>
-    <key alias="htmlEncodeHelp">Formater spesialtegn med tilsvarende HTML-tegn.</key>
-    <key alias="insertedAfter">Denne teksten vil settes inn etter verdien av feltet</key>
-    <key alias="insertedBefore">Denne teksten vil settes inn før verdien av feltet</key>
-    <key alias="lowercase">Små bokstaver</key>
-    <key alias="none">Ingen</key>
-    <key alias="postContent">Sett inn etter felt</key>
-    <key alias="preContent">Sett inn før felt</key>
-    <key alias="recursive">Rekursivt</key>
-    <key alias="standardFields">Standardfelter</key>
-    <key alias="uppercase">Store bokstaver</key>
-    <key alias="urlEncode">URL koding</key>
-    <key alias="urlEncodeHelp">Dersom innholdet av feltene skal sendes til en URL skal spesialtegn formatteres</key>
-    <key alias="usedIfAllEmpty">Denne teksten vil benyttes dersom feltene over er tomme</key>
-    <key alias="usedIfEmpty">Dette feltet vil benyttes dersom feltet over er tomt</key>
-    <key alias="withTime">Ja, med klokkeslett. Dato/tid separator: </key>
-  </area>
-  <area alias="translation">
-    <key alias="details">Oversettelses detaljer</key>
-    <key alias="DownloadXmlDTD">Last ned XML DTD</key>
-    <key alias="fields">Felt</key>
-    <key alias="includeSubpages">Inkluder undersider</key>
-    <key alias="mailBody"><![CDATA[
-			Hei %0%
-
-			Dette er en automatisk mail for å informere deg om at dokumentet '%1%'
-			har blitt anmodet oversatt til '%5%' av %2%.
-
-			Gå til http://%3%/Umbraco/translation/default.aspx?id=%4% for å redigere.
-
-			Ha en fin dag!
-
-			Vennlig hilsen Umbraco Robot.
-		]]></key>
-    <key alias="noTranslators">Ingen oversettelses-bruker funnet. Vennligst opprett en oversettelses-bruker før du begynner å sende innhold til oversetting</key>
-    <key alias="pageHasBeenSendToTranslation">Siden '%0%' har blitt sendt til oversetting</key>
-    <key alias="sendToTranslate">Send til oversetting</key>
-    <key alias="totalWords">Antall ord</key>
-    <key alias="translateTo">Oversett til</key>
-    <key alias="translationDone">Oversetting fullført.</key>
-    <key alias="translationDoneHelp">Du kan forhåndsvise sidene du nettopp har oversatt ved å klikke nedenfor. Hvis den originale siden finnes, vil du få en sammenligning av sidene.</key>
-    <key alias="translationFailed">Oversetting mislykkes, XML filen kan være korrupt</key>
-    <key alias="translationOptions">Alternativer for oversetting</key>
-    <key alias="translator">Oversetter</key>
-    <key alias="uploadTranslationXml">Last opp XML med oversettelse</key>
-  </area>
-  <area alias="treeHeaders">
-    <key alias="cacheBrowser">Hurtigbufferleser</key>
-    <key alias="contentRecycleBin">Papirkurv</key>
-    <key alias="createdPackages">Opprettede pakker</key>
-    <key alias="datatype">Datatyper</key>
-    <key alias="dictionary">Ordbok</key>
-    <key alias="installedPackages">Installerte pakker</key>
-    <key alias="installSkin">Installer utseende</key>
-    <key alias="installStarterKit">Installer startpakke</key>
-    <key alias="languages">Språk</key>
-    <key alias="localPackage">Installer lokal pakke</key>
-    <key alias="macros">Makroer</key>
-    <key alias="mediaTypes">Mediatyper</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="memberGroup">Medlemsgrupper</key>
-    <key alias="memberRoles">Roller</key>
-    <key alias="memberType">Medlemstyper</key>
-    <key alias="nodeTypes">Dokumenttyper</key>
-    <key alias="packager">Pakker</key>
-    <key alias="packages">Pakker</key>
-    <key alias="repositories">Installer fra pakkeregister</key>
-    <key alias="runway">Installer Runway</key>
-    <key alias="runwayModules">Runway moduler</key>
-    <key alias="scripting">Skriptfiler</key>
-    <key alias="scripts">Skript</key>
-    <key alias="stylesheets">Stiler</key>
-    <key alias="templates">Maler</key>
-    <key alias="userPermissions">Brukertillatelser</key>
-    <key alias="userTypes">Brukertyper typer</key>
-    <key alias="users">Brukere</key>
-  </area>
-  <area alias="update">
-    <key alias="updateAvailable">Ny oppdatering er klar</key>
-    <key alias="updateDownloadText">%0% er klar, klikk her for å laste ned</key>
-    <key alias="updateNoServer">Ingen forbindelse til server</key>
-    <key alias="updateNoServerError">Kunne ikke sjekke etter ny oppdatering. Se trace for mere info.</key>
-  </area>
-  <area alias="user">
-    <key alias="administrators">Administrator</key>
-    <key alias="categoryField">Kategorifelt</key>
-    <key alias="changePassword">Bytt passord</key>
-    <key alias="newPassword">Nytt passord</key>
-    <key alias="confirmNewPassword">Bekreft nytt passord</key>
-    <key alias="changePasswordDescription">Du kan endre passordet til Umbraco ved å fylle ut skjemaet under og klikke "Bytt passord" knappen.</key>
-    <key alias="contentChannel">Innholdskanal</key>
-    <key alias="descriptionField">Beskrivelsesfelt</key>
-    <key alias="disabled">Deaktiver bruker</key>
-    <key alias="documentType">Dokumenttype</key>
-    <key alias="editors">Redaktør</key>
-    <key alias="excerptField">Utdragsfelt</key>
-    <key alias="language">Språk</key>
-    <key alias="loginname">Brukernavn</key>
-    <key alias="mediastartnode">Øverste nivå i Media</key>
-    <key alias="modules">Moduler</key>
-    <key alias="noConsole">Deaktiver tilgang til Umbraco</key>
-    <key alias="password">Passord</key>
-    <key alias="resetPassword">Nullstill passord</key>
-    <key alias="passwordChanged">Passordet er endret</key>
-    <key alias="passwordConfirm">Bekreft nytt passord</key>
-    <key alias="passwordEnterNew">Nytt passord</key>
-    <key alias="passwordIsBlank">Nytt passord kan ikke være blankt</key>
-    <key alias="passwordCurrent">Gjeldende passord</key>
-    <key alias="passwordInvalid">Feil passord</key>
-    <key alias="passwordIsDifferent">Nytt og bekreftet passord må være like</key>
-    <key alias="passwordMismatch">Nytt og bekreftet passord må være like</key>
-    <key alias="permissionReplaceChildren">Overskriv tillatelser på undernoder</key>
-    <key alias="permissionSelectedPages">Du redigerer for øyeblikket tillatelser for sidene:</key>
-    <key alias="permissionSelectPages">Velg sider for å redigere deres tillatelser</key>
-    <key alias="searchAllChildren">Søk i alle undersider</key>
-    <key alias="startnode">Startnode</key>
-    <key alias="username">Navn</key>
-    <key alias="userPermissions">Brukertillatelser</key>
-    <key alias="writer">Forfatter</key>
-    <key alias="change">Endre</key>
-    <key alias="yourProfile" version="7.0">Din profil</key>
-    <key alias="yourHistory" version="7.0">Din historikk</key>
-    <key alias="sessionExpires" version="7.0">Sesjonen utløper om</key>
-  </area>
-</language>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
deleted file mode 100644
index 0a87631329..0000000000
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
+++ /dev/null
@@ -1,1269 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language alias="zh_tw" intName="Chinese (Taiwan)" localName="中文（正體，台灣）" lcid="0404" culture="zh-TW">
-  <creator>
-    <name>The Umbraco community</name>
-    <link>http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files</link>
-  </creator>
-  <area alias="actions">
-    <key alias="assignDomain">管理主機名稱</key>
-    <key alias="auditTrail">跟蹤審計</key>
-    <key alias="browse">流覽節點</key>
-    <key alias="changeDocType">改變文檔類型</key>
-    <key alias="copy">複製</key>
-    <key alias="create">創建</key>
-    <key alias="createPackage">創建擴展包</key>
-    <key alias="delete">刪除</key>
-    <key alias="disable">禁用</key>
-    <key alias="emptyRecycleBin">清空回收站</key>
-    <key alias="exportDocumentType">匯出文檔類型</key>
-    <key alias="importDocumentType">導入文檔類型</key>
-    <key alias="importPackage">導入擴展包</key>
-    <key alias="liveEdit">即時編輯模式</key>
-    <key alias="logout">退出</key>
-    <key alias="move">移動</key>
-    <key alias="notify">提醒</key>
-    <key alias="protect">公眾存取權限</key>
-    <key alias="publish">發佈</key>
-    <key alias="unpublish">取消發佈</key>
-    <key alias="refreshNode">重新載入節點</key>
-    <key alias="republish">重新發佈整站</key>
-    <key alias="restore" version="7.3.0">回復</key>
-    <key alias="rights">許可權</key>
-    <key alias="rollback">回滾</key>
-    <key alias="sendtopublish">提交至發佈者</key>
-    <key alias="sendToTranslate">發送給翻譯</key>
-    <key alias="sort">排序</key>
-    <key alias="toPublish">提交至發佈者</key>
-    <key alias="translate">翻譯</key>
-    <key alias="update">更新</key>
-    <key alias="defaultValue">預設值</key>
-  </area>
-  <area alias="assignDomain">
-    <key alias="permissionDenied">禁止訪問</key>
-    <key alias="addNew">添加功能變數名稱</key>
-    <key alias="remove">移除</key>
-    <key alias="invalidNode">錯誤的節點</key>
-    <key alias="invalidDomain">功能變數名稱錯誤</key>
-    <key alias="duplicateDomain">功能變數名稱重複</key>
-    <key alias="language">語言</key>
-    <key alias="domain">功能變數名稱</key>
-    <key alias="domainCreated">新功能變數名稱 '%0%' 已創建</key>
-    <key alias="domainDeleted">功能變數名稱 '%0%' 已刪除</key>
-    <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 />
-    也會改變目前節點設定，除非下方網域有其他項目。]]></key>
-    <key alias="setDomains">功能變數名稱</key>
-  </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">查看</key>
-  </area>
-  <area alias="buttons">
-    <key alias="clearSelection">清除選擇</key>
-    <key alias="select">選擇</key>
-    <key alias="somethingElse">做別的事情</key>
-    <key alias="bold">粗體</key>
-    <key alias="deindent">取消段落縮進</key>
-    <key alias="formFieldInsert">插入表單字段</key>
-    <key alias="graphicHeadline">插入圖片標題</key>
-    <key alias="htmlEdit">編輯Html</key>
-    <key alias="indent">段落縮進</key>
-    <key alias="italic">斜體</key>
-    <key alias="justifyCenter">居中</key>
-    <key alias="justifyLeft">左對齊</key>
-    <key alias="justifyRight">右對齊</key>
-    <key alias="linkInsert">插入連結</key>
-    <key alias="linkLocal">插入本地連結（錨點）</key>
-    <key alias="listBullet">圓點列表</key>
-    <key alias="listNumeric">數字清單</key>
-    <key alias="macroInsert">插入巨集</key>
-    <key alias="pictureInsert">插入圖片</key>
-    <key alias="relations">編輯關聯</key>
-    <key alias="returnToList">回到清單</key>
-    <key alias="save">保存</key>
-    <key alias="saveAndPublish">保存並發佈</key>
-    <key alias="saveToPublish">保存並提交審核</key>
-    <key alias="saveListView">保存清單檢視</key>
-    <key alias="showPage">預覽</key>
-    <key alias="showPageDisabled">因未設置範本無法預覽</key>
-    <key alias="styleChoose">選擇樣式</key>
-    <key alias="styleShow">顯示樣式</key>
-    <key alias="tableInsert">插入表格</key>
-  </area>
-  <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">要更改所選節點的文檔類型，先在列表中選擇合適的文檔類型。</key>
-    <key alias="changeDocTypeInstruction2">然後設置當前文檔類型到新文檔類型的各欄位間的對應映射關係並保存。</key>
-    <key alias="contentRepublished">內容已被重新發佈</key>
-    <key alias="currentProperty">當前屬性</key>
-    <key alias="currentType">當前類型</key>
-    <key alias="docTypeCannotBeChanged">不能改變文檔類型，因為沒有可替代的類型。</key>
-    <key alias="docTypeChanged">文檔類型已更改</key>
-    <key alias="mapProperties">要映射的欄位</key>
-    <key alias="mapToProperty">映射欄位</key>
-    <key alias="newTemplate">新範本</key>
-    <key alias="newType">新類型</key>
-    <key alias="none">無</key>
-    <key alias="selectedContent">內容</key>
-    <key alias="selectNewDocType">選擇新的文檔類型</key>
-    <key alias="successMessage">選中文檔的類型已被成功更改為[new type]，以下欄位被映射：</key>
-    <key alias="to">至</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">不能完成欄位映射，因為存在一個欄位映射至多欄位的問題。</key>
-    <key alias="validDocTypesNote">僅顯示可作為替代的文檔類型。</key>
-  </area>
-  <area alias="content">
-    <key alias="isPublished" version="7.2">已發表</key>
-    <key alias="about">關於本頁</key>
-    <key alias="alias">別名</key>
-    <key alias="alternativeTextHelp">（圖片的替代文本）</key>
-    <key alias="alternativeUrls">替代連結</key>
-    <key alias="clickToEdit">點擊編輯</key>
-    <key alias="createBy">創建者</key>
-    <key alias="createByDesc" version="7.0">創建者</key>
-    <key alias="updatedBy" version="7.0">更新者</key>
-    <key alias="createDate">創建時間</key>
-    <key alias="createDateDesc" version="7.0">此文件創建的日期時間</key>
-    <key alias="documentType">文檔類型</key>
-    <key alias="editing">編輯</key>
-    <key alias="expireDate">過期於</key>
-    <key alias="itemChanged">該項發佈之後有更改</key>
-    <key alias="itemNotPublished">該項沒有發佈</key>
-    <key alias="lastPublished">最近發佈</key>
-    <key alias="noItemsToShow">沒有可供顯示的項目</key>
-    <key alias="listViewNoItems" version="7.1.5">此列表中沒有可供顯示的項目</key>
-    <key alias="mediatype">媒體類型</key>
-    <key alias="mediaLinks">媒體連結位址</key>
-    <key alias="membergroup">會員組</key>
-    <key alias="memberrole">角色</key>
-    <key alias="membertype">會員類型</key>
-    <key alias="noDate">沒有選擇時間</key>
-    <key alias="nodeName">頁標題</key>
-    <key alias="otherElements">屬性</key>
-    <key alias="parentNotPublished">該文檔不可見，因為其上級 '%0%' 未發佈。</key>
-    <key alias="parentNotPublishedAnomaly">糟糕：該文檔已發佈，但是沒有更新至緩存（內部錯誤）</key>
-    <key alias="getUrlException">糟糕：沒辦法連結到此網址（內部錯誤-請參見記錄）</key>
-    <key alias="routeError">糟糕：此文件已經發表，但是網址和其他內容相衝 %0%</key>
-    <key alias="publish">發佈</key>
-    <key alias="publishStatus">發佈狀態</key>
-    <key alias="releaseDate">發佈於</key>
-    <key alias="unpublishDate">取消發表於</key>
-    <key alias="removeDate">清空時間</key>
-    <key alias="sortDone">排序完成</key>
-    <key alias="sortHelp">拖拽項目或按一下列頭即可排序，可以按住Shift多選。</key>
-    <key alias="statistics">統計</key>
-    <key alias="titleOptional">標題（可選）</key>
-    <key alias="altTextOptional">其他說明文字（可選）</key>
-    <key alias="type">類型</key>
-    <key alias="unpublish">取消發佈</key>
-    <key alias="updateDate">最近編輯</key>
-    <key alias="updateDateDesc" version="7.0">本文件修改時間</key>
-    <key alias="uploadClear">移除文件</key>
-    <key alias="urls">連結到文檔</key>
-    <key alias="memberof">會員組成員</key>
-    <key alias="notmemberof">非會員組成員</key>
-    <key alias="childItems" version="7.0">子項目</key>
-    <key alias="target" version="7.0">目標</key>
-    <key alias="scheduledPublishServerTime">預計發表的時間（伺服器端）</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.org/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">這是什麼意思？</a>]]></key>
-  </area>
-  <area alias="media">
-    <key alias="clickToUpload">點選以便上傳</key>
-    <key alias="orClickHereToUpload">或按這裡選擇檔案</key>
-    <key alias="maxFileSize">檔案大小上限為</key>
-  </area>
-  <area alias="member">
-    <key alias="createNewMember">新增一位會員</key>
-    <key alias="allMembers">所有會員</key>
-  </area>
-  <area alias="create">
-    <key alias="chooseNode">您想在哪裡創建 %0%</key>
-    <key alias="createUnder">創建在</key>
-    <key alias="updateData">選擇類型和標題</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[此處沒有被允許的文檔類型。請至設定中的 <strong>"文檔類型"</strong>處變更。]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[此處沒有被允許的媒體類型。請至設定中的 <strong>"媒體類型"</strong>處變更。]]></key>
-    <key alias="documentTypeWithoutTemplate">文檔類型沒有相關範本</key>
-    <key alias="newFolder">沒有資料夾</key>
-    <key alias="newDataType">新資料類別</key>
-  </area>
-  <area alias="dashboard">
-    <key alias="browser">流覽您的網站</key>
-    <key alias="dontShowAgain">- 隱藏</key>
-    <key alias="nothinghappens">如果Umbraco沒有打開，您可能需要允許彈出式視窗。</key>
-    <key alias="openinnew">已經在新視窗中打開</key>
-    <key alias="restart">重啟</key>
-    <key alias="visit">訪問</key>
-    <key alias="welcome">歡迎</key>
-  </area>
-  <area alias="prompt">
-    <key alias="stay">留下</key>
-    <key alias="discardChanges">放棄變更</key>
-    <key alias="unsavedChanges">您有未存檔的變更</key>
-    <key alias="unsavedChangesWarning">您確定要離開本頁？ - 您有未存檔的變更</key>
-  </area>
-  <area alias="bulk">
-    <key alias="done">完成</key>
-    <key alias="deletedItem">刪除 %0% 個項目</key>
-    <key alias="deletedItems">刪除 %0% 個項目</key>
-    <key alias="deletedItemOfItem">刪除 %1% 個中的 %0% 個項目</key>
-    <key alias="deletedItemOfItems">刪除 %1% 個中的 %0% 個項目</key>
-    <key alias="publishedItem">已發佈 %0% 個項目</key>
-    <key alias="publishedItems">已發佈 %0% 個項目</key>
-    <key alias="publishedItemOfItem">已發佈 %1% 個中的 %0% 個項目</key>
-    <key alias="publishedItemOfItems">已發佈 %1% 個中的 %0% 個項目</key>
-    <key alias="unpublishedItem">取消發佈 %0% 個項目</key>
-    <key alias="unpublishedItems">取消發佈 %0% 個項目</key>
-    <key alias="unpublishedItemOfItem">取消發佈 %1 個中的 %0% 個項目</key>
-    <key alias="unpublishedItemOfItems">取消發佈 %1 個中的 %0% 個項目</key>
-    <key alias="movedItem">移動 %0% 個項目</key>
-    <key alias="movedItems">移動 %0% 個項目</key>
-    <key alias="movedItemOfItem">移動 %1 個中的 %0% 個項目</key>
-    <key alias="movedItemOfItems">移動 %1 個中的 %0% 個項目</key>
-    <key alias="copiedItem">複製 %0% 個項目</key>
-    <key alias="copiedItems">複製 %0% 個項目</key>
-    <key alias="copiedItemOfItem">複製 %1 個中的 %0% 個項目</key>
-    <key alias="copiedItemOfItems">複製 %1 個中的 %0% 個項目</key>
-  </area>
-  <area alias="defaultdialogs">
-    <key alias="anchorInsert">錨點名稱</key>
-    <key alias="assignDomain">管理主機名稱</key>
-    <key alias="closeThisWindow">關閉窗口</key>
-    <key alias="confirmdelete">您確定要刪除嗎</key>
-    <key alias="confirmdisable">您確定要禁用嗎</key>
-    <key alias="confirmlogout">您確定嗎?</key>
-    <key alias="confirmSure">您確定嗎？</key>
-    <key alias="cut">剪切</key>
-    <key alias="editdictionary">編輯字典項</key>
-    <key alias="editlanguage">編輯語言</key>
-    <key alias="insertAnchor">插入本地連結</key>
-    <key alias="insertCharacter">插入字元</key>
-    <key alias="insertgraphicheadline">插入圖片標題</key>
-    <key alias="insertimage">插入圖片</key>
-    <key alias="insertlink">插入連結</key>
-    <key alias="insertMacro">插入巨集</key>
-    <key alias="inserttable">插入表格</key>
-    <key alias="lastEdited">最近編輯</key>
-    <key alias="link">連結</key>
-    <key alias="linkinternal">內部連結：</key>
-    <key alias="linklocaltip">本地連結請用“#”號開頭</key>
-    <key alias="linknewwindow">在新視窗中打開？</key>
-    <key alias="macroContainerSettings">巨集設置</key>
-    <key alias="macroDoesNotHaveProperties">本巨集沒有包含您可以編輯的屬性</key>
-    <key alias="paste">粘貼</key>
-    <key alias="permissionsEdit">編輯許可權</key>
-    <key alias="recycleBinDeleting">正在清空回收站，請不要關閉窗口。</key>
-    <key alias="recycleBinIsEmpty">回收站已清空</key>
-    <key alias="recycleBinWarning">從回收站刪除的項目將不可恢復</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>的網站服務目前出現些狀況，而我們無能為力。我們對此不便感到十分抱歉。]]></key>
-    <key alias="regexSearchHelp">查找規則運算式來驗證輸入，如: 'email、'zip-code'、'url'。</key>
-    <key alias="removeMacro">移除巨集</key>
-    <key alias="requiredField">必填項目</key>
-    <key alias="sitereindexed">網站已重建索引</key>
-    <key alias="siterepublished">網站緩存已刷新，所有已發佈的內容更新生效。</key>
-    <key alias="siterepublishHelp">網站緩存將會刷新，所有已發佈的內容將會更新。</key>
-    <key alias="tableColumns">表格列數</key>
-    <key alias="tableRows">表格行數</key>
-    <key alias="templateContentAreaHelp"><![CDATA[<strong>設定預留位置代碼</strong> 以便您要在子範本中插入內容到本範本時，填入此代碼到 <code>&lt;asp:content /&gt;</code> 裡面。]]></key>
-    <key alias="templateContentPlaceHolderHelp"><![CDATA[<strong>選擇預留位置代碼</strong> 於此清單中。您只能選擇目前父範本中的代碼。]]></key>
-    <key alias="thumbnailimageclickfororiginal">點擊圖片查看完整大小</key>
-    <key alias="treepicker">拾取項</key>
-    <key alias="viewCacheItem">查看緩存項</key>
-    <key alias="relateToOriginalLabel">與原本相關</key>
-    <key alias="theFriendliestCommunity">最友善的社群</key>
-    <key alias="linkToPage">頁面連結</key>
-    <key alias="openInNewWindow">打開此連結文檔至新視窗或標籤頁</key>
-    <key alias="linkToMedia">媒體連結</key>
-    <key alias="selectMedia">選擇媒體</key>
-    <key alias="selectIcon">選擇圖示</key>
-    <key alias="selectItem">選擇項目</key>
-    <key alias="selectLink">選擇連結</key>
-    <key alias="selectMacro">選擇巨集</key>
-    <key alias="selectContent">選擇內容</key>
-    <key alias="selectMember">選擇會員</key>
-    <key alias="selectMemberGroup">選擇會員群組</key>
-    <key alias="noIconsFound">沒有找到任何圖示</key>
-    <key alias="noMacroParams">本巨集沒有需要參數</key>
-    <key alias="externalLoginProviders">外部登入提供者</key>
-    <key alias="exceptionDetail">例外細節</key>
-    <key alias="stacktrace">詳細記錄</key>
-    <key alias="innerException">內部例外</key>
-    <key alias="linkYour">連結您的</key>
-    <key alias="unLinkYour">取消連結您的</key>
-    <key alias="account">帳戶</key>
-    <key alias="selectEditor">選擇編輯器</key>
-  </area>
-  <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      為此字典項目 '<em>%0%</em>' 編輯不同語言版本，<br />您可以在左方選單「語言」中增添新的語言
-   ]]></key>
-    <key alias="displayName">語言名稱</key>
-  </area>
-  <area alias="placeholders">
-    <key alias="username">輸入您的使用者名稱</key>
-    <key alias="password">輸入您的密碼</key>
-    <key alias="confirmPassword">確認您的密碼</key>
-    <key alias="nameentity">命名此 %0%...</key>
-    <key alias="entername">輸入一個名稱</key>
-    <key alias="label">標籤...</key>
-    <key alias="enterDescription">輸入一段描述...</key>
-    <key alias="search">搜尋請輸入...</key>
-    <key alias="filter">過濾請輸入...</key>
-    <key alias="enterTags">增加標籤（每個標籤後請按輸入鍵）...</key>
-    <key alias="email">輸入您的電子郵件</key>
-  </area>
-  <area alias="editcontenttype">
-    <key alias="allowedchildnodetypes">允許子項節點類型</key>
-    <key alias="create">創建</key>
-    <key alias="deletetab">刪除選項卡</key>
-    <key alias="description">描述</key>
-    <key alias="newtab">新建選項卡</key>
-    <key alias="tab">選項卡</key>
-    <key alias="thumbnail">縮略圖</key>
-    <key alias="createListView" version="7.2">新增自訂清單檢視</key>
-    <key alias="removeListView" version="7.2">移除自訂清單檢視</key>
-  </area>
-  <area alias="editdatatype">
-    <key alias="addPrevalue">添加預設值</key>
-    <key alias="dataBaseDatatype">資料庫資料類型</key>
-    <key alias="guid">資料類型唯一標識</key>
-    <key alias="renderControl">渲染控制項</key>
-    <key alias="rteButtons">按鈕</key>
-    <key alias="rteEnableAdvancedSettings">允許高級設置</key>
-    <key alias="rteEnableContextMenu">允許快顯功能表</key>
-    <key alias="rteMaximumDefaultImgSize">插入圖片預設最大</key>
-    <key alias="rteRelatedStylesheets">關聯的樣式表</key>
-    <key alias="rteShowLabel">顯示標籤</key>
-    <key alias="rteWidthAndHeight">寬和高</key>
-  </area>
-  <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">資料已保存，但是發佈前您需要修正一些錯誤：</key>
-    <key alias="errorChangingProviderPassword">當前成員提供程式不支援修改密碼(EnablePasswordRetrieval的值應該為true)</key>
-    <key alias="errorExistsWithoutTab">%0% 已存在</key>
-    <key alias="errorHeader">發現錯誤：</key>
-    <key alias="errorHeaderWithoutTab">發現錯誤：</key>
-    <key alias="errorInPasswordFormat">密碼最少%0%位元，且至少包含%1%位元非字母數位記號</key>
-    <key alias="errorIntegerWithoutTab">%0% 必須是整數</key>
-    <key alias="errorMandatory">%1% 中的 %0% 欄位是必填項</key>
-    <key alias="errorMandatoryWithoutTab">%0% 是必填項</key>
-    <key alias="errorRegExp">%1% 中的 %0% 格式不正確</key>
-    <key alias="errorRegExpWithoutTab">%0% 格式不正確</key>
-  </area>
-  <area alias="errors">
-    <key alias="receivedErrorFromServer">收到伺服器傳來的錯誤</key>
-    <key alias="dissallowedMediaType">該檔案類型已被管理員禁用</key>
-    <key alias="codemirroriewarning">注意，儘管配置中允許CodeMirror，但是它在IE上不夠穩定，所以無法在IE運行。</key>
-    <key alias="contentTypeAliasAndNameNotNull">請為新的屬性類型填寫名稱和別名！</key>
-    <key alias="filePermissionsError">許可權有問題，訪問指定文檔或資料夾失敗！</key>
-    <key alias="macroErrorLoadingPartialView">讀取片段視圖腳本錯誤（檔案：%0%）</key>
-    <key alias="macroErrorLoadingUsercontrol">讀取使用者控制項 %0% 錯誤</key>
-    <key alias="missingTitle">請輸入標題</key>
-    <key alias="missingType">請選擇類型</key>
-    <key alias="pictureResizeBiggerThanOrg">圖片尺寸大於原始尺寸不會提高圖片品質，您確定要把圖片尺寸變大嗎?</key>
-    <key alias="startNodeDoesNotExists">預設打開頁面不存在，請聯繫管理員</key>
-    <key alias="stylesMustMarkBeforeSelect">請先選擇內容，再設置樣式。</key>
-    <key alias="stylesNoStylesOnPage">沒有可用的樣式</key>
-    <key alias="tableColMergeLeft">請把游標放在您要合併的兩個儲存格中的左邊儲存格</key>
-    <key alias="tableSplitNotSplittable">非合併儲存格不能分離。</key>
-  </area>
-  <area alias="general">
-    <key alias="about">關於</key>
-    <key alias="action">操作</key>
-    <key alias="actions">操作</key>
-    <key alias="add">添加</key>
-    <key alias="alias">別名</key>
-    <key alias="all">所有</key>
-    <key alias="areyousure">您確定嗎？</key>
-    <key alias="back">回去</key>
-    <key alias="border">邊框</key>
-    <key alias="by">或</key>
-    <key alias="cancel">取消</key>
-    <key alias="cellMargin">儲存格邊距</key>
-    <key alias="choose">選擇</key>
-    <key alias="close">關閉</key>
-    <key alias="closewindow">關閉窗口</key>
-    <key alias="comment">備註</key>
-    <key alias="confirm">確認</key>
-    <key alias="constrainProportions">強制屬性</key>
-    <key alias="continue">繼續</key>
-    <key alias="copy">複製</key>
-    <key alias="create">創建</key>
-    <key alias="database">資料庫</key>
-    <key alias="date">時間</key>
-    <key alias="default">默認</key>
-    <key alias="delete">刪除</key>
-    <key alias="deleted">已刪除</key>
-    <key alias="deleting">正在刪除…</key>
-    <key alias="design">設計</key>
-    <key alias="dimensions">規格</key>
-    <key alias="down">下</key>
-    <key alias="download">下載</key>
-    <key alias="edit">編輯</key>
-    <key alias="edited">已編輯</key>
-    <key alias="elements">元素</key>
-    <key alias="email">郵箱</key>
-    <key alias="error">錯誤</key>
-    <key alias="findDocument">查找文檔</key>
-    <key alias="height">高</key>
-    <key alias="help">幫助</key>
-    <key alias="icon">圖示</key>
-    <key alias="import">導入</key>
-    <key alias="innerMargin">內邊距</key>
-    <key alias="insert">插入</key>
-    <key alias="install">安裝</key>
-    <key alias="invalid">不合格</key>
-    <key alias="justify">對齊</key>
-    <key alias="language">語言</key>
-    <key alias="layout">佈局</key>
-    <key alias="loading">載入中</key>
-    <key alias="locked">鎖定</key>
-    <key alias="login">登入</key>
-    <key alias="logoff">退出</key>
-    <key alias="logout">登出</key>
-    <key alias="macro">巨集</key>
-    <key alias="mandatory">必要</key>
-    <key alias="move">移動</key>
-    <key alias="name">名稱</key>
-    <key alias="new">新的</key>
-    <key alias="next">下一步</key>
-    <key alias="no">否</key>
-    <key alias="of">屬於</key>
-    <key alias="ok">確定</key>
-    <key alias="open">打開</key>
-    <key alias="or">或</key>
-    <key alias="password">密碼</key>
-    <key alias="path">路徑</key>
-    <key alias="placeHolderID">預留位置代碼</key>
-    <key alias="pleasewait">請稍候…</key>
-    <key alias="previous">上一步</key>
-    <key alias="properties">屬性</key>
-    <key alias="reciept">接收資料郵箱</key>
-    <key alias="recycleBin">回收站</key>
-    <key alias="remaining">保持狀態中</key>
-    <key alias="rename">重命名</key>
-    <key alias="renew">更新</key>
-    <key alias="required" version="7.0">必要</key>
-    <key alias="retry">重試</key>
-    <key alias="rights">許可權</key>
-    <key alias="search">搜索</key>
-    <key alias="server">伺服器</key>
-    <key alias="show">顯示</key>
-    <key alias="showPageOnSend">在發送時預覽</key>
-    <key alias="size">大小</key>
-    <key alias="sort">排序</key>
-    <key alias="submit">送出</key>
-    <key alias="type">類型</key>
-    <key alias="typeToSearch">輸入內容開始搜尋…</key>
-    <key alias="up">上</key>
-    <key alias="update">更新</key>
-    <key alias="upgrade">更新</key>
-    <key alias="upload">上傳</key>
-    <key alias="url">連結位址</key>
-    <key alias="user">用戶</key>
-    <key alias="username">用戶名</key>
-    <key alias="value">值</key>
-    <key alias="view">查看</key>
-    <key alias="welcome">歡迎…</key>
-    <key alias="width">寬</key>
-    <key alias="yes">是</key>
-    <key alias="folder">資料夾</key>
-    <key alias="searchResults">搜尋結果</key>
-    <key alias="reorder">重新排列</key>
-    <key alias="reorderDone">我已經完成排列</key>
-    <key alias="preview">預覽</key>
-    <key alias="changePassword">更改密碼</key>
-    <key alias="to">到</key>
-    <key alias="listView">清單檢視</key>
-    <key alias="saving">存檔中...</key>
-    <key alias="current">目前</key>
-    <key alias="embed">內嵌</key>
-    <key alias="selected">選取的</key>
-  </area>
-  <area alias="colors">
-    <key alias="blue">藍</key>
-  </area>
-  <area alias="shortcuts">
-    <key alias="addTab">增加標籤頁</key>
-    <key alias="addProperty">增加屬性</key>
-    <key alias="addEditor">增加編輯器</key>
-    <key alias="addTemplate">增加範本</key>
-    <key alias="addChildNode">增加子節點</key>
-    <key alias="addChild">增加子項目</key>
-    <key alias="editDataType">編輯資料類別</key>
-    <key alias="navigateSections">瀏覽區塊</key>
-    <key alias="shortcut">捷徑</key>
-    <key alias="showShortcuts">顯示捷徑</key>
-    <key alias="toggleListView">開關清單檢視</key>
-    <key alias="toggleAllowAsRoot">開關是否允許為根項目</key>
-  </area>
-  <area alias="graphicheadline">
-    <key alias="backgroundcolor">背景色</key>
-    <key alias="bold">粗體</key>
-    <key alias="color">前景色</key>
-    <key alias="font">字體</key>
-    <key alias="text">文本</key>
-  </area>
-  <area alias="headers">
-    <key alias="page">頁面</key>
-  </area>
-  <area alias="installer">
-    <key alias="databaseErrorCannotConnect">無法連接到資料庫。</key>
-    <key alias="databaseErrorWebConfig">無法保存web.config檔，請手工修改。</key>
-    <key alias="databaseFound">發現資料庫</key>
-    <key alias="databaseHeader">資料庫配置</key>
-    <key alias="databaseInstall"><![CDATA[
-      請按 <strong>安裝</strong> 按鈕來安裝Umbraco資料庫 %0%
-    ]]></key>
-    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% 已經複製到您的資料庫了。請按<strong>下一步</strong>繼續。]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>沒有找到資料庫！請確認檔案"web.config"中的字串"connection string"是否正確。</p>
-              <p>請編輯檔案"web.config" (例如使用Visual Studio或您喜歡的編輯器)，移動到檔案底部，並在名稱為"UmbracoDbDSN"的字串中設定資料庫連結資訊，並存檔。</p>
-              <p>
-              點選<strong>重試</strong>按鈕當上述步驟完成。<br />
-              <a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              在此查詢更多編輯web.config的資訊。</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[要完成此步驟，您必須瞭解連結資料庫伺服器的重要資訊("connection string")。<br />
-        若需要時，請聯繫您的網路公司。如果您在本地機器或伺服器安裝的話，您也許需要聯絡系統管理者。]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
-      <p>
-      點選<strong>升級</strong>按鈕來升級Umbraco資料庫 %0%</p>
-      <p>
-      請別擔心 - 不會刪除任何資料而且馬上就會繼續運作！
-      </p>
-      ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[您的資料庫已經升級至最新版本%0%。<br />點選<strong>下一步</strong>繼續。]]></key>
-    <key alias="databaseUpToDate"><![CDATA[目前資料庫是最新的！點選<strong>下一步</strong>繼續設定精靈。]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>預設使用者的密碼必須更改！</strong>]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<strong>預設使用者已經被暫停或沒有Umbraco的使用權！</strong></p><p>不需更多的操作步驟。點選<b>下一步</b>繼續。]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<strong>安裝後預設使用者的密碼已經成功修改！</strong></p><p>不需更多的操作步驟。點選<b>下一步</b>繼續。]]></key>
-    <key alias="defaultUserPasswordChanged">密碼已更改</key>
-    <key alias="greatStart">作為入門者，從視頻教程開始吧！</key>
-    <key alias="licenseText">點擊下一步 (或在Web.config中自行修改UmbracoConfigurationStatus)，意味著您接受上述授權合約。</key>
-    <key alias="None">安裝失敗。</key>
-    <key alias="permissionsAffectedFolders">受影響的檔和資料夾</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">此處查看更多資訊</key>
-    <key alias="permissionsAffectedFoldersText">您需要對以下檔和資料夾授於ASP.NET用戶修改許可權</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>您的權限設定幾近完美！</strong><br /><br />
-        您可以正常執行Umbraco沒有任何問題，只差您將沒有辦法安裝那些建議需要全部許可權的插件。]]></key>
-    <key alias="permissionsHowtoResolve">如何解決</key>
-    <key alias="permissionsHowtoResolveLink">點擊閱讀文字版</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[觀賞我們的<strong>影片教學</strong>來瞭解如何設定Umbraco的資料夾權限或閱讀文字版本。]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>您的權限可能有點小問題！</strong>
-      <br/><br />
-      您可以正常執行Umbraco沒有任何問題，然而您將無法新增資料夾或安裝那些可以讓Umbraco發揮全力的插件。]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>您的權限設定尚未未完成！</strong>
-          <br /><br />
-         您需要更新權限設定才能執行Umbraco。]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>您的權限設定完美無瑕！</strong><br /><br />
-              您已經準備好執行Umbraco和安裝插件！]]></key>
-    <key alias="permissionsResolveFolderIssues">解決資料夾問題</key>
-    <key alias="permissionsResolveFolderIssuesLink">點此查看ASP.NET和創建資料夾的問題解決方案</key>
-    <key alias="permissionsSettingUpPermissions">設置資料夾許可權</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco需要某些資料夾的寫和修改權限來儲存檔案，好比圖片或文檔。
-      它也需要儲存暫時性資料（快取暫存）來增強網站的表現。
-    ]]></key>
-    <key alias="runwayFromScratch">我要從頭開始</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        您的網站目前完全沒有資料，所以如果您想要從頭開始並增添您自己的文檔種類和範本，現在正是絕佳時機。
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">學習該怎麼做</a>)
-        您晚點仍可以選擇安裝Runway，請至開發者區域選擇安裝。
-      ]]></key>
-    <key alias="runwayHeader">您剛剛安裝了一個乾淨的系統，要繼續嗎？</key>
-    <key alias="runwayInstalled">“Runway”已安裝</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      您已經有了良好的基礎。請選擇您想要在其上安裝哪些模組。<br />
-      這是我們的模組推薦清單，選取您想要安裝的項目，或者至 <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList"> 查詢完整清單</a>。
-      ]]></key>
-    <key alias="runwayOnlyProUsers">僅推薦高級用戶使用</key>
-    <key alias="runwaySimpleSite">給我一個簡單的網站</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway"是一個提供基本檔案類別和範本的簡單網站。安裝程式會自動幫您設定Runway，
-      但你仍可輕易編輯，擴充或移除它。它並非必要項目而且您可以在沒它的情況下完美執行Umbraco。然而，
-      Runway提供一個輕鬆簡便但基於寶貴經驗的平台讓您可以更快開始。
-      如果您安裝Runway，您還可以選擇名為「Runway模組」的基本區塊來加強Runway頁面。
-        </p>
-        <small>
-        <em>內含於Runway：</em> 首頁，準備開始頁面，模組安裝頁面。<br />
-        <em>可選模組：</em> 上方瀏覽列，網站地圖，聯絡，藝廊。
-        </small>
-      ]]></key>
-    <key alias="runwayWhatIsRunway">“Runway”是什麼？</key>
-    <key alias="step1">步驟 1/5：接受授權合約</key>
-    <key alias="step2">步驟 2/5：資料庫配置</key>
-    <key alias="step3">步驟 3/5：文件許可權驗證</key>
-    <key alias="step4">步驟 4/5：系統安全性</key>
-    <key alias="step5">步驟 5/5：一切就緒，可以開始使用系統。</key>
-    <key alias="thankYou">感謝選擇我們的產品</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>參觀您的新網站</h3>
-您剛安裝好Runway，何不瞧瞧它的模樣。]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>更多的幫忙與資訊</h3>
-從我們獲獎的社群得到幫助，瀏覽文件，或觀看免費影片來瞭解如何輕鬆架設網站，如何使用插件，和瞭解Umbraco項目名稱的快速上手指引。]]></key>
-    <key alias="theEndHeader">系統 %0% 安裝完畢</key>
-    <key alias="theEndInstallFailed"><![CDATA[欲完成安裝，您會需要手動修改<strong>/web.config 檔案</strong>並且更新AppSetting中的字串<strong>UmbracoConfigurationStatus</strong> 內容為 <strong>'%0%'</strong>。]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[您可以點選下方按鈕「啟動Umbraco」來獲得<strong>快速開始指引</strong>。<br />如果您是<strong>Umbraco的新成員</strong>，
-您可以在其中找到相當多的資源。]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>啟動Umbraco</h3>
-想要管理您的網站時，只需開啟Umbraco後台便可增加內容，更新範本和樣式表，或增添新功能。]]></key>
-    <key alias="Unavailable">無法連接到資料庫。</key>
-    <key alias="Version3">系統版本 3</key>
-    <key alias="Version4">系統版本 4</key>
-    <key alias="watch">觀看</key>
-    <key alias="welcomeIntro"><![CDATA[精靈會指引您完成設定Umbraco的過程，以便重新開始或升級到3.0。<br /><br />
-                               點選<strong>"下一步"</strong>來啟動精靈。]]></key>
-  </area>
-  <area alias="language">
-    <key alias="cultureCode">語言代碼</key>
-    <key alias="displayName">語言名稱</key>
-  </area>
-  <area alias="lockout">
-    <key alias="lockoutWillOccur">使用者在空閒狀態下將會自動登出</key>
-    <key alias="renewSession">已更新，繼續工作。</key>
-  </area>
-  <area alias="login">
-    <key alias="greeting0">超級星期天快樂</key>
-    <key alias="greeting1">瘋狂星期一快樂</key>
-    <key alias="greeting2">熱鬧星期二快樂</key>
-    <key alias="greeting3">美妙星期三快樂</key>
-    <key alias="greeting4">悅耳星期四快樂</key>
-    <key alias="greeting5">時髦星期五快樂</key>
-    <key alias="greeting6">喵喵星期六快樂</key>
-    <key alias="instruction">下方登入</key>
-    <key alias="signInWith">登入使用</key>
-    <key alias="timeout">連線時間過了</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
-    <key alias="forgottenPassword">忘記密碼？</key>
-    <key alias="forgottenPasswordInstruction">一封內有重設密碼連結的電子郵件已經寄出給您</key>
-    <key alias="requestPasswordResetConfirmation">一封內有重設密碼連結的電子郵件已經寄到此信箱</key>
-    <key alias="returnToLogin">回到登入畫面</key>
-    <key alias="setPasswordInstruction">請輸入新密碼</key>
-    <key alias="setPasswordConfirmation">您的密碼已經更新</key>
-    <key alias="resetCodeExpired">您點選的連結是無效或過期的</key>
-    <key alias="resetPasswordEmailCopySubject">Umbraco：重設密碼</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[<p>您登入到後台的使用者名稱是：<strong>%0%</strong></p><p>點選<a href="%1%"><strong>這裡</strong></a>來重設您的密碼或將此連結複製/貼上到您的瀏覽器：</p><p><em>%1%</em></p>]]></key>
-  </area>
-  <area alias="main">
-    <key alias="dashboard">儀錶板</key>
-    <key alias="sections">區域</key>
-    <key alias="tree">內容</key>
-  </area>
-  <area alias="moveOrCopy">
-    <key alias="choose">選擇上面的頁面…</key>
-    <key alias="copyDone">%0% 被複製到 %1%</key>
-    <key alias="copyTo">將 %0% 複製到</key>
-    <key alias="moveDone">%0% 已被移動到 %1%</key>
-    <key alias="moveTo">將 %0% 移動到</key>
-    <key alias="nodeSelected">作為內容的根結點，點“確定”。</key>
-    <key alias="noNodeSelected">尚未選擇節點，請選擇一個節點點擊“確定”。</key>
-    <key alias="notAllowedByContentType">類型不符不允許選擇</key>
-    <key alias="notAllowedByPath">該項不能移到其子項</key>
-    <key alias="notAllowedAtRoot">當前節點不能建在根節點下</key>
-    <key alias="notValid">您在子項的許可權不夠，不允許該操作。</key>
-    <key alias="relateToOriginal">複本和原本建立關聯</key>
-  </area>
-  <area alias="notifications">
-    <key alias="editNotifications">為 %0% 編寫通知</key>
-    <key alias="mailBody"><![CDATA[
-      哈嘍 %0%
-
-      這是一封自動產生的信件來通知您 %1% 工作
-      已經在頁面 %2% 上由使用者 %3% 執行完成
-
-
-      請移至下列網址編輯： http://%4%/#/content/content/edit/%5%
-
-      祝您有美好的一天！
-
-      Umbraco機器人 謹上
-    ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>哈嘍 %0%</p>
-
-		  <p>這是一封自動產生的信件來通知您<strong> %1% </strong>工作
-		 已經在頁面 <strong>%2%</strong> 上由使用者 <strong>%3%</strong> 執行完成
-	  </p>
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;編輯&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-		  <p>
-			  <h3>更新摘要：</h3>
-			  <table style="width: 100%;">
-						   %6%
-				</table>
-			 </p>
-
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;編輯&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-
-		  <p>祝您有美好的一天！<br /><br />
-			  Umbraco機器人 謹上
-		  </p>]]></key>
-    <key alias="mailSubject">在 %2%，[%0%] 關於 %1% 的通告已執行。</key>
-    <key alias="notifications">通知</key>
-  </area>
-  <area alias="packager">
-    <key alias="chooseLocalPackageText"><![CDATA[
-      要從您的電腦上選擇擴展包，請按瀏覽<br />
-         按鈕並點選該檔案。Umbraco擴展包通常有「.zip」的副檔名。
-      ]]></key>
-    <key alias="packageAuthor">作者</key>
-    <key alias="packageDemonstration">演示</key>
-    <key alias="packageDocumentation">文檔</key>
-    <key alias="packageMetaData">中繼資料</key>
-    <key alias="packageName">名稱</key>
-    <key alias="packageNoItemsHeader">擴展包不含任何項</key>
-    <key alias="packageNoItemsText"><![CDATA[這個擴展包檔案裡面沒有任何移除項目資訊。<br/><br/>
-      您可以點選下方「移除擴展包」來安全地移除此項目。]]></key>
-    <key alias="packageNoUpgrades">無可用更新</key>
-    <key alias="packageOptions">選項</key>
-    <key alias="packageReadme">說明</key>
-    <key alias="packageRepository">程式庫</key>
-    <key alias="packageUninstallConfirm">確認卸載</key>
-    <key alias="packageUninstalledHeader">已卸載</key>
-    <key alias="packageUninstalledText">擴展包卸載成功</key>
-    <key alias="packageUninstallHeader">卸載</key>
-    <key alias="packageUninstallText"><![CDATA[您可以取消選取任何不想要現在移除的項目。當您點選「確認移除」按鈕後，所有點選項目將被移除。<br />
-      <span style="color: Red; font-weight: bold;">注意：</span> 任何文檔，媒體或需要這些項目才能運作的物件將會停止運作，並可能使得系統不穩定，
-      請小心移除。若有疑慮，請聯絡擴展包作者。]]></key>
-    <key alias="packageUpgradeDownload">從程式庫下載更新</key>
-    <key alias="packageUpgradeHeader">更新擴展包</key>
-    <key alias="packageUpgradeInstructions">更新說明</key>
-    <key alias="packageUpgradeText">擴展包有可用的更新，您可以從程式庫網站更新。</key>
-    <key alias="packageVersion">版本</key>
-    <key alias="packageVersionHistory">版本歷史</key>
-    <key alias="viewPackageWebsite">訪問擴展包網站</key>
-    <key alias="packageAlreadyInstalled">擴展包已安裝</key>
-    <key alias="targetVersionMismatch">這個擴展包無法安裝，它需要Umbraco至少是版本 %0%</key>
-    <key alias="installStateUninstalling">移除中...</key>
-    <key alias="installStateDownloading">下載中...</key>
-    <key alias="installStateImporting">匯入中...</key>
-    <key alias="installStateInstalling">安裝中...</key>
-    <key alias="installStateRestarting">重新啟動中，請稍後...</key>
-    <key alias="installStateComplete">都好了，您的瀏覽器將重新整理，請稍待...</key>
-  </area>
-  <area alias="paste">
-    <key alias="doNothing">帶格式粘貼（不推薦）</key>
-    <key alias="errorMessage">您所粘貼的文本含有特殊字元或格式，Umbraco將清除以適應網頁。</key>
-    <key alias="removeAll">無格式粘貼</key>
-    <key alias="removeSpecialFormattering">粘貼並移除格式（推薦）</key>
-  </area>
-  <area alias="publicAccess">
-    <key alias="paAdvanced">基於角色的保護</key>
-    <key alias="paAdvancedHelp"><![CDATA[如果您希望使用角色來控制登入訪問權限，<br /> 請使用Umbraco的會員群組。]]></key>
-    <key alias="paAdvancedNoGroups">使用基於角色的授權需要首先建立會員組。</key>
-    <key alias="paErrorPage">錯誤頁</key>
-    <key alias="paErrorPageHelp">當用戶登錄後訪問沒有許可權的頁時顯示該頁</key>
-    <key alias="paHowWould">選擇限制訪問此頁的方式</key>
-    <key alias="paIsProtected">%0% 現在處於受保護狀態</key>
-    <key alias="paIsRemoved">%0% 的保護被取消 </key>
-    <key alias="paLoginPage">登錄頁</key>
-    <key alias="paLoginPageHelp">選擇公開的登錄入口</key>
-    <key alias="paRemoveProtection">取消保護</key>
-    <key alias="paSelectPages">選擇一個包含登錄表單和提示資訊的頁</key>
-    <key alias="paSelectRoles">選擇訪問該頁的角色類型</key>
-    <key alias="paSetLogin">為此頁設置帳號和密碼</key>
-    <key alias="paSimple">單用戶保護</key>
-    <key alias="paSimpleHelp">如果您只希望提供一個用戶名和密碼就能訪問</key>
-  </area>
-  <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% 無法現在發佈，因為它已經設定發佈時程。
-    ]]></key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% 無法發佈，因為已經過期。
-    ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% 無法發佈，因為屬性：%1% 沒有通過驗證規則。
-    ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% 無法發佈，因為第三方擴充元件取消這項操作。
-    ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% 無法發佈，因為父頁面並沒有發佈。
-    ]]></key>
-    <key alias="includeUnpublished">包含未發佈的子項</key>
-    <key alias="inProgress">正在發佈，請稍候…</key>
-    <key alias="inProgressCounter">%0% 中的 %1% 頁面已發佈…</key>
-    <key alias="nodePublish">%0% 已發佈</key>
-    <key alias="nodePublishAll">%0% 及其子項已發佈</key>
-    <key alias="publishAll">發佈 %0% 及其子項</key>
-    <key alias="publishHelp"><![CDATA[點選<em>發佈</em>按鈕來將<strong>%0%</strong>的內容設定為公開。<br/><br />
-      您可以同時發佈本頁以及其子項目若您點選下面的<em>包含子頁</em>。
-      ]]></key>
-  </area>
-  <area alias="colorpicker">
-    <key alias="noColors">您尚未設定任何許可顏色</key>
-  </area>
-  <area alias="relatedlinks">
-    <key alias="enterExternal">輸入外部連結</key>
-    <key alias="chooseInternal">選擇內部連結</key>
-    <key alias="caption">標題</key>
-    <key alias="link">連結</key>
-    <key alias="newWindow">新視窗</key>
-    <key alias="captionPlaceholder">輸入新標題</key>
-    <key alias="externalLinkPlaceholder">輸入連結</key>
-  </area>
-  <area alias="imagecropper">
-    <key alias="reset">重設</key>
-  </area>
-  <area alias="rollback">
-    <key alias="currentVersion">當前版本</key>
-    <key alias="diffHelp"><![CDATA[這顯示目前版本以及所選版本的差異。<br /><del>紅色</del> 文字將不會顯示於所選版本，而<ins>綠色</ins>表示增加部分。]]></key>
-    <key alias="documentRolledBack">文檔已回滾</key>
-    <key alias="htmlHelp">這顯示所選版本的HTML格式，如果您想要比較兩版本的差異，請使用比較檢視</key>
-    <key alias="rollbackTo">回滾至</key>
-    <key alias="selectVersion">選擇版本</key>
-    <key alias="view">查看</key>
-  </area>
-  <area alias="scripts">
-    <key alias="editscript">編輯腳本</key>
-  </area>
-  <area alias="sections">
-    <key alias="concierge">Concierge</key>
-    <key alias="content">內容</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">開發</key>
-    <key alias="installer">設定精靈</key>
-    <key alias="media">媒體</key>
-    <key alias="member">會員</key>
-    <key alias="newsletters">消息</key>
-    <key alias="settings">設置</key>
-    <key alias="statistics">統計</key>
-    <key alias="translation">翻譯</key>
-    <key alias="users">用戶</key>
-    <key alias="help" version="7.0">說明</key>
-    <key alias="forms">表單</key>
-  </area>
-  <area alias="help">
-    <key alias="theBestUmbracoVideoTutorials">最好的Umbraco影片教學</key>
-  </area>
-  <area alias="settings">
-    <key alias="defaulttemplate">預設範本</key>
-    <key alias="dictionary editor egenskab">字典鍵</key>
-    <key alias="importDocumentTypeHelp">要導入文檔類型，請點擊“流覽”按鈕，再點擊“導入”，然後在您電腦上查找 ".udt"檔導入（下一頁中需要您再次確認）</key>
-    <key alias="newtabname">新建選項卡標題</key>
-    <key alias="nodetype">節點類型</key>
-    <key alias="objecttype">類型</key>
-    <key alias="stylesheet">樣式表</key>
-    <key alias="script">腳本</key>
-    <key alias="stylesheet editor egenskab">樣式表屬性</key>
-    <key alias="tab">選項卡</key>
-    <key alias="tabname">選項卡標題</key>
-    <key alias="tabs">選項卡</key>
-    <key alias="contentTypeEnabled">主控文件類型啟動</key>
-    <key alias="contentTypeUses">該文檔類型使用</key>
-    <key alias="asAContentMasterType">作為主控文件類型. 主控文件類型的標籤只能在主控文件類型裡修改。</key>
-    <key alias="noPropertiesDefinedOnTab">沒有欄位設置在該標籤頁</key>
-    <key alias="addIcon">增加圖示</key>
-  </area>
-  <area alias="sort">
-    <key alias="sortOrder">排列順序</key>
-    <key alias="sortCreationDate">增添時間</key>
-    <key alias="sortDone">排序完成。</key>
-    <key alias="sortHelp">上下拖拽項目或按一下列頭進行排序</key>
-    <key alias="sortPleaseWait"><![CDATA[ 請稍後。項目正在排序，這需要一點時間。]]></key>
-  </area>
-  <area alias="speechBubbles">
-    <key alias="validationFailedHeader">驗證</key>
-    <key alias="validationFailedMessage">驗證錯誤一定要修正才能儲存項目</key>
-    <key alias="operationFailedHeader">失敗</key>
-    <key alias="invalidUserPermissionsText">使用者權限不足，無法完成操作</key>
-    <key alias="operationCancelledHeader">已取消</key>
-    <key alias="operationCancelledText">操作被協力廠商外掛程式取消</key>
-    <key alias="contentPublishedFailedByEvent">發佈被協力廠商外掛程式取消</key>
-    <key alias="contentTypeDublicatePropertyType">屬性類型已存在</key>
-    <key alias="contentTypePropertyTypeCreated">屬性類型已創建</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[名稱：%0% <br />資料類別：%1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">屬性類型已刪除</key>
-    <key alias="contentTypeSavedHeader">內容類別型已保存</key>
-    <key alias="contentTypeTabCreated">選項卡已創建</key>
-    <key alias="contentTypeTabDeleted">選項卡已刪除</key>
-    <key alias="contentTypeTabDeletedText">id為%0%的選項卡已刪除</key>
-    <key alias="cssErrorHeader">樣式表未保存</key>
-    <key alias="cssSavedHeader">樣式表已保存</key>
-    <key alias="cssSavedText">樣式表保存，無錯誤。</key>
-    <key alias="dataTypeSaved">資料類型已保存</key>
-    <key alias="dictionaryItemSaved">字典項已保存</key>
-    <key alias="editContentPublishedFailedByParent">因為上級頁面未發佈導致發佈失敗！</key>
-    <key alias="editContentPublishedHeader">內容已發佈</key>
-    <key alias="editContentPublishedText">公眾可見</key>
-    <key alias="editContentSavedHeader">內容已保存</key>
-    <key alias="editContentSavedText">請發佈以使更改生效</key>
-    <key alias="editContentSendToPublish">提交審核</key>
-    <key alias="editContentSendToPublishText">更改已提交審核</key>
-    <key alias="editMediaSaved">媒體已保存</key>
-    <key alias="editMediaSavedText">媒體已保存</key>
-    <key alias="editMemberSaved">會員已保存</key>
-    <key alias="editStylesheetPropertySaved">樣式表屬性已保存</key>
-    <key alias="editStylesheetSaved">樣式表已保存</key>
-    <key alias="editTemplateSaved">範本已保存</key>
-    <key alias="editUserError">保存使用者出錯（請查看日誌）</key>
-    <key alias="editUserSaved">用戶已保存</key>
-    <key alias="editUserTypeSaved">用戶類型已保存</key>
-    <key alias="fileErrorHeader">檔未保存</key>
-    <key alias="fileErrorText">檔無法保存，請檢查許可權。</key>
-    <key alias="fileSavedHeader">檔保存</key>
-    <key alias="fileSavedText">檔保存，無錯誤。</key>
-    <key alias="languageSaved">語言已保存</key>
-    <key alias="mediaTypeSavedHeader">媒體類別已儲存</key>
-    <key alias="memberTypeSavedHeader">會員類別已儲存</key>
-    <key alias="templateErrorHeader">範本未保存</key>
-    <key alias="templateErrorText">範本別名相同</key>
-    <key alias="templateSavedHeader">範本已保存</key>
-    <key alias="templateSavedText">範本保存，無錯誤。</key>
-    <key alias="contentUnpublished">內容已取消發佈</key>
-    <key alias="partialViewSavedHeader">片段視圖已保存</key>
-    <key alias="partialViewSavedText">片段視圖保存，無錯誤。</key>
-    <key alias="partialViewErrorHeader">片段視圖未保存</key>
-    <key alias="partialViewErrorText">片段視圖因為錯誤未能保存</key>
-  </area>
-  <area alias="stylesheet">
-    <key alias="aliasHelp">使用CSS語法，如：h1、.redHeader、.blueTex。</key>
-    <key alias="editstylesheet">編輯樣式表</key>
-    <key alias="editstylesheetproperty">編輯樣式屬性</key>
-    <key alias="nameHelp">編輯器中的樣式屬性名 </key>
-    <key alias="preview">預覽</key>
-    <key alias="styles">樣式</key>
-  </area>
-  <area alias="template">
-    <key alias="edittemplate">編輯範本</key>
-    <key alias="insertContentArea">插入內容區</key>
-    <key alias="insertContentAreaPlaceHolder">插入內容預留位置</key>
-    <key alias="insertDictionaryItem">插入字典項</key>
-    <key alias="insertMacro">插入巨集</key>
-    <key alias="insertPageField">插入頁欄位</key>
-    <key alias="mastertemplate">母版</key>
-    <key alias="quickGuide">範本標籤快速指南</key>
-    <key alias="template">範本</key>
-  </area>
-  <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">選擇內容類別</key>
-    <key alias="chooseLayout">選擇排列方式</key>
-    <key alias="addRows">新增一行</key>
-    <key alias="addElement">新增內容</key>
-    <key alias="dropElement">放棄內容</key>
-    <key alias="settingsApplied">設定已儲存</key>
-    <key alias="contentNotAllowed">此處不允許有內容</key>
-    <key alias="contentAllowed">此處允許有內容</key>
-    <key alias="clickToEmbed">點選來內嵌</key>
-    <key alias="clickToInsertImage">點選來插入圖片</key>
-    <key alias="placeholderImageCaption">圖片標題...</key>
-    <key alias="placeholderWriteHere">在此填寫...</key>
-    <key alias="gridLayouts">網格排列方式</key>
-    <key alias="gridLayoutsDetail">排列是指網格編輯器的整體工作區域，通常您只需要一種或兩種排列方式</key>
-    <key alias="addGridLayout">增加網格排列方式</key>
-    <key alias="addGridLayoutDetail">藉由設定列寬以及增加新的區域來調整排列方式</key>
-    <key alias="rowConfigurations">行設定</key>
-    <key alias="rowConfigurationsDetail">行是預先水平排列的格子</key>
-    <key alias="addRowConfiguration">增加行設定</key>
-    <key alias="addRowConfigurationDetail">藉由設定小格寬度和增添小格來調整此行</key>
-    <key alias="columns">列</key>
-    <key alias="columnsDetails">網格排列方式的列總數</key>
-    <key alias="settings">設定</key>
-    <key alias="settingsDetails">調整設定編輯器可以改變的項目</key>
-    <key alias="styles">樣式</key>
-    <key alias="stylesDetails">調整樣式編輯器可以改變的項目</key>
-    <key alias="allowAllEditors">允許所有編輯器</key>
-    <key alias="allowAllRowConfigurations">允許所有行設定</key>
-    <key alias="setAsDefault">定為預設</key>
-    <key alias="chooseExtra">選擇額外</key>
-    <key alias="chooseDefault">選擇預設</key>
-    <key alias="areAdded">已增加</key>
-  </area>
-  <area alias="contentTypeEditor">
-    <key alias="compositions">組合</key>
-    <key alias="noTabs">您沒有增加任何選項卡</key>
-    <key alias="inheritedFrom">繼承的表格</key>
-    <key alias="addProperty">增加屬性</key>
-    <key alias="requiredLabel">必要標籤</key>
-    <key alias="enableListViewHeading">允許清單檢視</key>
-    <key alias="enableListViewDescription">允許內容項目顯示成可以排列及搜尋的清單，子項目不會被顯示</key>
-    <key alias="allowedTemplatesHeading">允許的範本</key>
-    <key alias="allowedTemplatesDescription">選擇哪些範本編輯器可以使用於此類別的內容</key>
-    <key alias="allowAsRootHeading">允許為根項目</key>
-    <key alias="allowAsRootDescription">允許編輯器新增此類別的內容為根項目</key>
-    <key alias="childNodesHeading">允許子節點種類</key>
-    <key alias="childNodesDescription">允許某些特定種類能夠成為此種類內容的子項目</key>
-    <key alias="chooseChildNode">選擇子節點</key>
-    <key alias="compositionsDescription">從已存在的文檔類別中繼承選項卡以及屬性。新選項卡將被新增至目前文檔種類或合併至已存在同名的選項卡中。</key>
-    <key alias="compositionInUse">此內容種類已經用於集合中，因此不能重複添加本身。</key>
-    <key alias="noAvailableCompositions">沒有可用於集合的內容種類。</key>
-    <key alias="availableEditors">可用的編輯器</key>
-    <key alias="reuse">重複使用</key>
-    <key alias="editorSettings">編輯器設定</key>
-    <key alias="configuration">設定</key>
-    <key alias="yesDelete">是，刪除</key>
-    <key alias="movedUnderneath">已移至下層</key>
-    <key alias="copiedUnderneath">已複製至下層</key>
-    <key alias="folderToMove">選擇要移動的資料夾</key>
-    <key alias="folderToCopy">選擇要複製的資料夾</key>
-    <key alias="structureBelow">至下方樹狀結構</key>
-    <key alias="allDocumentTypes">所有文檔種類</key>
-    <key alias="allDocuments">所有文檔</key>
-    <key alias="allMediaItems">所有媒體項目</key>
-    <key alias="usingThisDocument">使用此文檔種類的將被永久刪除，請確認您也想要將它們刪除。</key>
-    <key alias="usingThisMedia">使用此媒體種類的將被永久刪除，請確認您也想要將它們刪除。</key>
-    <key alias="usingThisMember">使用此會員種類的將被永久刪除，請確認您也想要將它們刪除。</key>
-    <key alias="andAllDocuments">以及所有使用此種類的文件項目</key>
-    <key alias="andAllMediaItems">以及所有使用此種類的媒體項目</key>
-    <key alias="andAllMembers">以及所有使用此種類的會員項目</key>
-    <key alias="memberCanEdit">會員可以編輯</key>
-    <key alias="showOnMemberProfile">顯示於會員資料</key>
-  </area>
-  <area alias="templateEditor">
-    <key alias="alternativeField">替代欄位</key>
-    <key alias="alternativeText">替代文本</key>
-    <key alias="casing">大小寫</key>
-    <key alias="encoding">編碼</key>
-    <key alias="chooseField">選取欄位</key>
-    <key alias="convertLineBreaks">轉換分行符號</key>
-    <key alias="convertLineBreaksHelp">將換行符號取代成為HTML標籤 &amp;lt;br&amp;gt;</key>
-    <key alias="customFields">自訂欄位</key>
-    <key alias="dateOnly">是，僅日期</key>
-    <key alias="formatAsDate">格式化時間</key>
-    <key alias="htmlEncode">HTML編碼</key>
-    <key alias="htmlEncodeHelp">將替換HTML中的特殊字元</key>
-    <key alias="insertedAfter">將在欄位值後插入</key>
-    <key alias="insertedBefore">將在欄位值前插入</key>
-    <key alias="lowercase">小寫</key>
-    <key alias="none">無</key>
-    <key alias="postContent">欄位後插入</key>
-    <key alias="preContent">欄位前插入</key>
-    <key alias="recursive">遞迴</key>
-    <key alias="standardFields">標準欄位</key>
-    <key alias="uppercase">大寫</key>
-    <key alias="urlEncode">URL編碼</key>
-    <key alias="urlEncodeHelp">將格式化URL中的特殊字元</key>
-    <key alias="usedIfAllEmpty">當上面欄位值為空時使用</key>
-    <key alias="usedIfEmpty">該欄位僅在主欄位為空時使用</key>
-    <key alias="withTime">是，含時間，分隔符號為： </key>
-  </area>
-  <area alias="translation">
-    <key alias="details">翻譯詳情</key>
-    <key alias="DownloadXmlDTD">下載 XML DTD</key>
-    <key alias="fields">欄位</key>
-    <key alias="includeSubpages">包含子頁</key>
-    <key alias="mailBody"><![CDATA[
-      哈嘍 %0%
-
-      這是一封自動產生的郵件通知您文檔 %1%
-      已經被 %2 要求翻譯成 %5%
-
-      請移至此網址來編輯： http://%3%/translation/details.aspx?id=%4%
-
-      或登入系統以獲取您的翻譯任務簡報。
-
-      http://%3%
-
-      祝您有美好的一天
-
-      Umbraco機器人 謹上
-    ]]></key>
-    <key alias="noTranslators">沒有翻譯員，請創建翻譯員角色的用戶。</key>
-    <key alias="pageHasBeenSendToTranslation">頁面'%0%'已經發送給翻譯</key>
-    <key alias="sendToTranslate">發送頁面'%0%'以便翻譯</key>
-    <key alias="totalWords">總字數</key>
-    <key alias="translateTo">翻譯到</key>
-    <key alias="translationDone">翻譯完成。</key>
-    <key alias="translationDoneHelp">您可以流覽剛翻譯的頁面，如果原始頁存在，您將得到兩者的比較。</key>
-    <key alias="translationFailed">翻譯失敗，XML可能損壞了。</key>
-    <key alias="translationOptions">翻譯選項</key>
-    <key alias="translator">翻譯員</key>
-    <key alias="uploadTranslationXml">上傳翻譯的xml</key>
-  </area>
-  <area alias="treeHeaders">
-    <key alias="cacheBrowser">緩存流覽</key>
-    <key alias="contentRecycleBin">回收站</key>
-    <key alias="createdPackages">創建擴展包</key>
-    <key alias="dataTypes">資料類型</key>
-    <key alias="dictionary">字典</key>
-    <key alias="installedPackages">已安裝的擴展包</key>
-    <key alias="installSkin">安裝皮膚</key>
-    <key alias="installStarterKit">安裝新手套件</key>
-    <key alias="languages">語言</key>
-    <key alias="localPackage">安裝本地擴展包</key>
-    <key alias="macros">巨集</key>
-    <key alias="mediaTypes">媒體類型</key>
-    <key alias="member">會員</key>
-    <key alias="memberGroups">會員組</key>
-    <key alias="memberRoles">角色</key>
-    <key alias="memberTypes">會員類型</key>
-    <key alias="documentTypes">文檔類型</key>
-    <key alias="relationTypes">相關類型</key>
-    <key alias="packager">擴展包</key>
-    <key alias="packages">擴展包</key>
-    <key alias="repositories">從線上程式庫安裝</key>
-    <key alias="runway">安裝Runway</key>
-    <key alias="runwayModules">Runway模組</key>
-    <key alias="scripting">Scripting文件</key>
-    <key alias="scripts">腳本</key>
-    <key alias="stylesheets">樣式表</key>
-    <key alias="templates">範本</key>
-  </area>
-  <area alias="update">
-    <key alias="updateAvailable">有可用更新</key>
-    <key alias="updateDownloadText">%0%已就緒，點擊這裡下載</key>
-    <key alias="updateNoServer">無到伺服器的連接</key>
-    <key alias="updateNoServerError">檢查更新失敗</key>
-  </area>
-  <area alias="user">
-    <key alias="administrators">管理員</key>
-    <key alias="categoryField">分類欄位</key>
-    <key alias="changePassword">更改密碼</key>
-    <key alias="newPassword">更改密碼</key>
-    <key alias="confirmNewPassword">確認新密碼</key>
-    <key alias="changePasswordDescription">要改變密碼，請在框中輸入新密碼，然後按一下“更改密碼”。</key>
-    <key alias="contentChannel">內容頻道</key>
-    <key alias="descriptionField">描述欄位</key>
-    <key alias="disabled">禁用用戶</key>
-    <key alias="documentType">文檔類型</key>
-    <key alias="editors">編輯</key>
-    <key alias="excerptField">排除欄位</key>
-    <key alias="language">語言</key>
-    <key alias="loginname">登錄</key>
-    <key alias="mediastartnode">默認打開媒體項</key>
-    <key alias="modules">區域</key>
-    <key alias="noConsole">禁用後臺管理介面</key>
-    <key alias="oldPassword">舊的密碼</key>
-    <key alias="password">密碼</key>
-    <key alias="resetPassword">重設密碼</key>
-    <key alias="passwordChanged">您的密碼已更改！</key>
-    <key alias="passwordConfirm">重輸密碼</key>
-    <key alias="passwordEnterNew">輸入新密碼</key>
-    <key alias="passwordIsBlank">新密碼不能為空！</key>
-    <key alias="passwordCurrent">當前密碼</key>
-    <key alias="passwordInvalid">密碼錯誤</key>
-    <key alias="passwordIsDifferent">新密碼和重輸入的密碼不一致，請重試！</key>
-    <key alias="passwordMismatch">重輸的密碼和原密碼不一致！</key>
-    <key alias="permissionReplaceChildren">替換子項許可權設置</key>
-    <key alias="permissionSelectedPages">您正在修改存取權限的頁面：</key>
-    <key alias="permissionSelectPages">選擇要修改許可權的頁</key>
-    <key alias="searchAllChildren">搜索子物件</key>
-    <key alias="startnode">預設打開內容項</key>
-    <key alias="username">用戶名</key>
-    <key alias="userPermissions">用戶許可權</key>
-    <key alias="writer">撰稿人</key>
-    <key alias="change">改變</key>
-    <key alias="yourProfile" version="7.0">您的個人檔案</key>
-    <key alias="yourHistory" version="7.0">您的歷程記錄</key>
-    <key alias="sessionExpires" version="7.0">連線到期於</key>
-  </area>
-  <area alias="validation">
-    <key alias="validation">驗證</key>
-    <key alias="validateAsEmail">以電子郵件驗證</key>
-    <key alias="validateAsNumber">以數字驗證</key>
-    <key alias="validateAsUrl">以網址驗證</key>
-    <key alias="enterCustomValidation">...或輸入自訂驗證</key>
-    <key alias="fieldIsMandatory">必要欄位</key>
-  </area>
-  <area alias="healthcheck">
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: XPath
-		   3: Configuration file path
-	  -->
-    <key alias="checkSuccessMessage">數值已設為推薦值：%0%</key>
-    <key alias="rectifySuccessMessage">在設定檔 %3% 中XPath %2% 的數值設為 %1% 。</key>
-    <key alias="checkErrorMessageDifferentExpectedValue">在設定檔 %3% 中XPath %2% 的預期值設為 %1% ，但卻是 %0%。</key>
-    <key alias="checkErrorMessageUnexpectedValue">在設定檔 %3% 中XPath %2% 的值為非預期值 %0%。</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-	  -->
-    <key alias="customErrorsCheckSuccessMessage">自訂錯誤設定為 %0%</key>
-    <key alias="customErrorsCheckErrorMessage">自訂錯誤設定為 %0。建議在上線前改為 %1%。</key>
-    <key alias="customErrorsCheckRectifySuccessMessage">自訂錯誤成功設定為 %0%</key>
-    <key alias="macroErrorModeCheckSuccessMessage">巨集錯誤設為 %0%</key>
-    <key alias="macroErrorModeCheckErrorMessage">巨集錯誤設為 %0%，如此一來，當巨集有任何錯誤時會阻止某些或全部頁面正常載入。改正會將此設定 %1%。</key>
-    <key alias="macroErrorModeCheckRectifySuccessMessage">巨集錯誤已設為 %0%</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: Server version
-	  -->
-    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">嘗試略過IIS自訂錯誤目前設為 %0%，而且您使用的IIS版本為 %1%。</key>
-    <key alias="trySkipIisCustomErrorsCheckErrorMessage">嘗試略過IIS自訂錯誤目前設為 %0%，然而在您使用的IIS版本為 %2% 時，建議設定是 %1%。</key>
-    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">嘗試略過IIS自訂錯誤已成功設為 %0%。</key>
-    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
-    <key alias="configurationServiceFileNotFound">檔案不存在：%0%。</key>
-    <key alias="configurationServiceNodeNotFound"><![CDATA[於設定檔<strong>'%1%'</strong>中無法找到<strong>'%0%'</strong>。]]></key>
-    <key alias="configurationServiceError">有錯誤產生，請參閱下列錯誤的紀錄：%0%。</key>
-    <key alias="httpsCheckInvalidCertificate">憑證驗證錯誤：%0%</key>
-    <key alias="healthCheckInvalidUrl">網址探查錯誤：%0% - '%1%'</key>
-    <key alias="httpsCheckIsCurrentSchemeHttps">您目前使用HTTPS瀏覽本站：%0%</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">在您的web.config檔案中，appSetting的umbracoUseSSL是設為false。當您開始使用HTTPS時，應將其改為 true。</key>
-    <key alias="httpsCheckConfigurationCheckResult">在您的web.config檔案中，appSetting的umbracoUseSSL是設為 %0%，您的cookies %0% 標成安全。</key>
-    <key alias="httpsCheckEnableHttpsError">無法在您的web.config檔案中，更新appSetting的umbracoUseSSL設定，錯誤訊息：%0%</key>
-    <!-- The following keys don't get tokens passed in -->
-    <key alias="httpsCheckEnableHttpsButton">開啟HTTPS</key>
-    <key alias="httpsCheckEnableHttpsDescription">在web.config檔案中，將appSetting的umbracoUseSSL設true。</key>
-    <key alias="httpsCheckEnableHttpsSuccess">在您的web.config檔案中，appSetting的umbracoUseSSL已設為 true，您的cookies 將被標成安全。</key>
-    <key alias="rectifyButton">修正</key>
-    <key alias="cannotRectifyShouldNotEqual">無法修正比較種類檢查為'ShouldNotEqual'。</key>
-    <key alias="cannotRectifyShouldEqualWithValue">用提供的數值無法修正比較種類檢查為'ShouldEqual'。</key>
-    <key alias="valueToRectifyNotProvided">沒有提供要修正檢查的數值。</key>
-    <key alias="compilationDebugCheckSuccessMessage">偵錯編輯模式關閉。</key>
-    <key alias="compilationDebugCheckErrorMessage">偵錯編輯模式目前已開啟。上線前建議將其關閉。</key>
-    <key alias="compilationDebugCheckRectifySuccessMessage">偵錯編輯模式已成功關閉。</key>
-    <key alias="traceModeCheckSuccessMessage">詳細記錄模式已關閉。</key>
-    <key alias="traceModeCheckErrorMessage">詳細記錄模式目前已開啟。上線前建議將其關閉。</key>
-    <key alias="traceModeCheckRectifySuccessMessage">詳細記錄模式已成功關閉。</key>
-    <key alias="folderPermissionsCheckMessage">所有資料夾已有正確權限設定。</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFolderPermissionFailed"><![CDATA[以下資料夾必須擁有修改權限，但無法連接：<strong>%0%</strong>。]]></key>
-    <key alias="optionalFolderPermissionFailed"><![CDATA[以下資料夾必須擁有修改權限好讓系統可以正常運作，但無法連接：<strong>%0%</strong>。如果無須寫入，不需採取行動。]]></key>
-    <key alias="filePermissionsCheckMessage">所有檔案已有正確權限設定。</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFilePermissionFailed"><![CDATA[以下檔案必須擁有寫入權限，但無法連接：<strong>%0%</strong>。]]></key>
-    <key alias="optionalFilePermissionFailed"><![CDATA[以下檔案必須擁有寫入權限好讓系統可以正常運作，但無法連接：<strong>%0%</strong>。如果無須寫入，不需採取行動。]]></key>
-    <key alias="clickJackingCheckHeaderFound"><![CDATA[標頭或meta-tag的 <strong>X-Frame-Options</strong> 設定能控制網站是否可以被其他人IFRAMEd已找到。]]></key>
-    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[標頭或meta-tag的 <strong>X-Frame-Options</strong> 設定能控制網站是否可以被其他人IFRAMEd沒有找到。]]></key>
-    <key alias="setHeaderInConfig">調整設定的標頭</key>
-    <key alias="clickJackingSetHeaderInConfigDescription">在 web.config 的 httpProtocol/customHeaders 區域增加設定來防止本站被別的網站IFRAMEd。</key>
-    <key alias="clickJackingSetHeaderInConfigSuccess">在 web.config 的 httpProtocol/customHeaders 區域已經增加設定來防止本站被別的網站IFRAMEd。</key>
-    <key alias="setHeaderInConfigError">無法更新web.config檔案，錯誤：%0%</key>
-    <!-- The following key get these tokens passed in:
-	    0: Comma delimitted list of headers found
-  	-->
-    <key alias="excessiveHeadersFound"><![CDATA[在標頭中有找到揭露網站技術的資訊：<strong>%0%</strong>。]]></key>
-    <key alias="excessiveHeadersNotFound">在標頭中沒有找到揭露網站技術的資訊。</key>
-    <key alias="smtpMailSettingsNotFound">在 Web.config 檔案中，找不到 system.net/mailsettings。</key>
-    <key alias="smtpMailSettingsHostNotConfigured">在 Web.config 檔案中的 system.net/mailsettings，沒有設定 host 。</key>
-    <key alias="smtpMailSettingsConnectionSuccess">SMTP設定正確，而且服務正常運作。</key>
-    <key alias="smtpMailSettingsConnectionFail">SMTP伺服器 %0% : %1% 無法連接。請確認在Web.config 檔案中 system.net/mailsettings 設定正確。</key>
-    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[提醒郵件已經設為 <strong>%0%</strong>。]]></key>
-    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[提醒郵件仍為預設值<strong>%0%</strong>。]]></key>
-  </area>
-  <area alias="redirectUrls">
-    <key alias="disableUrlTracker">停止網址追蹤器</key>
-    <key alias="enableUrlTracker">啟動網址追蹤器</key>
-    <key alias="originalUrl">原本網址</key>
-    <key alias="redirectedTo">轉址成</key>
-    <key alias="noRedirects">沒有任何轉址</key>
-    <key alias="noRedirectsDescription">當發佈後的頁面改名或移動時，會自動轉址至新網頁。</key>
-    <key alias="removeButton">移除</key>
-    <key alias="confirmRemove">您確定要移除從 %0% 到 %1% 的轉址嗎？</key>
-    <key alias="redirectRemoved">轉址已移除。</key>
-    <key alias="redirectRemoveError">移除轉址錯誤。
-</key>
-    <key alias="confirmDisable">您確定要停止轉址追蹤器？</key>
-    <key alias="disabledConfirm">轉址追蹤器已停止。</key>
-    <key alias="disableError">停止轉址追蹤器錯誤，更多資訊請參閱您的紀錄檔。</key>
-    <key alias="enabledConfirm">轉址追蹤器已開啟。</key>
-    <key alias="enableError">啟動轉址追蹤器錯誤，更多資訊請參閱您的紀錄檔。</key>
-  </area>
-</language>

From d0016d6a7e86b42969757ba38839d538f9c3fc1f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 16 Jan 2019 10:40:04 +0100
Subject: [PATCH 84/84] Upgrade to MB -alpha.33 supporting elements

---
 build/NuSpecs/UmbracoCms.nuspec          | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 1b7a1c5ae1..3cb3d0d875 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.32]" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.33]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
             <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ca4acd9d66..6967ac74c2 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -107,7 +107,7 @@
     <PackageReference Include="MySql.Data" Version="6.10.7" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.32</Version>
+      <Version>8.0.0-alpha.33</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>