Merge branch origin/dev-v7 into temp8

2018-09-06 13:07:09 +02:00
parent 2ae9405fcf 5dd04d9a3e
commit 612c38654d
76 changed files with 1607 additions and 130 deletions
--- 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;
@@ -21,7 +22,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));
        }
    }
 }