Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html

@@ -8,6 +8,7 @@
         </div>
         <div class="sub-view-column-right">
             <umb-toggle
+                data-element="permissions-allow-as-root"
                 checked="model.allowAsRoot"
                 on-click="vm.toggle()"
                 hotkey="alt+shift+r"

src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json

@@ -207,6 +207,18 @@
                 "content": "Click <b>Submit</b> to add the property to the document type.",
                 "event": "click"
             },
+            {
+                "element": "[data-element~='sub-view-permissions']",
+                "title": "Check the document type permissions",
+                "content": "Click <b>Permissions</b> to view the permissions page.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='permissions-allow-as-root']",
+                "title": "Allow this document type to work at the root of your site",
+                "content": "Toggle the switch <b>Allow as root</b> to allow new content pages based on this document type to be created at the root of your site",
+                "event": "click"
+            },
             {
                 "element": "[data-element='button-save']",
                 "title": "Save the document type",

src/Umbraco.Web/Models/ImageCropDataSet.cs

@@ -66,7 +66,7 @@ namespace Umbraco.Web.Models
 
         public bool HasFocalPoint()
         {
-            return FocalPoint != null && FocalPoint.Left != 0.5m && FocalPoint.Top != 0.5m;
+            return FocalPoint != null && (FocalPoint.Left != 0.5m || FocalPoint.Top != 0.5m);
         }
 
         public bool HasCrop(string alias)
@@ -153,4 +153,4 @@ namespace Umbraco.Web.Models
             return !Equals(left, right);
         }
     }
-}
+}

src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Umbraco.Core;
@@ -20,7 +21,7 @@ namespace Umbraco.Web.WebApi
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            writer.WriteValue(((DateTime)value).ToString(_dateTimeFormat));
+            writer.WriteValue(((DateTime)value).ToString(_dateTimeFormat, CultureInfo.InvariantCulture));
         }
     }
-}
+}