From f42862c42aa3882bf5b70b2c614c28b505cc55ff Mon Sep 17 00:00:00 2001 From: Barry Bell <38332224+Bazmech@users.noreply.github.com> Date: Tue, 21 Aug 2018 21:07:54 +0100 Subject: [PATCH 1/3] Update ImageCropDataSet.cs If only one of the Left or Right values changed the HasFocalPoint function would return false but this should now return true if only one is altered --- src/Umbraco.Web/Models/ImageCropDataSet.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Models/ImageCropDataSet.cs b/src/Umbraco.Web/Models/ImageCropDataSet.cs index 00f46dd2d7..dd18184636 100644 --- a/src/Umbraco.Web/Models/ImageCropDataSet.cs +++ b/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); } } -} \ No newline at end of file +} From e4d8fcf019cfe9420d08a787f8ca217d029c6b69 Mon Sep 17 00:00:00 2001 From: Arbie Sarkissian Date: Fri, 24 Aug 2018 13:45:53 +0430 Subject: [PATCH 2/3] U4-11506 - Fix Gregorian DateTime.MinValue is out of range for some calendars (like PersianCalendar) (#2821) --- src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs b/src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs index 00216e2ece..c0793dc945 100644 --- a/src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs +++ b/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)); } } -} \ No newline at end of file +} From 56de9ff4aeaf248b7127e989ec5ad31a16086c87 Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Sun, 26 Aug 2018 08:52:14 -0400 Subject: [PATCH 3/3] Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851) --- .../documenttypes/views/permissions/permissions.html | 1 + .../config/BackOfficeTours/getting-started.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) 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 6923cb5a6f..d8a4f5057a 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 @@ -8,6 +8,7 @@
Submit to add the property to the document type.", "event": "click" }, + { + "element": "[data-element~='sub-view-permissions']", + "title": "Check the document type permissions", + "content": "Click Permissions 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 Allow as root 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",