Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx

@@ -22,6 +22,11 @@
                 var parser = document.createElement('a');
                 parser.href = parts[1];
 
+                // This next line may seem redundant but is required to get around a bug in IE 
+                // that doesn't set the parser.hostname or parser.protocol correctly for relative URLs.
+                // See https://gist.github.com/jlong/2428561#gistcomment-1461205
+                parser.href = parser.href;
+
                 // => "http:"
                 if (!parser.protocol || (parser.protocol.toLowerCase() !== "http:" && parser.protocol.toLowerCase() !== "https:")) {
                     throw "invalid protocol";

src/Umbraco.Web.UI/umbraco/developer/Packages/proxy.htm

@@ -15,6 +15,11 @@
             var parser = document.createElement('a');
             parser.href = window.location.search.substring(1);
 
+            // This next line may seem redundant but is required to get around a bug in IE 
+            // that doesn't set the parser.hostname or parser.protocol correctly for relative URLs.
+            // see https://gist.github.com/jlong/2428561#gistcomment-1461205
+            parser.href = parser.href;
+
             // => "http:"
             if (parser.protocol && (parser.protocol.toLowerCase() != "http:" && parser.protocol.toLowerCase() != "https:")) {
                 throw "invalid protocol";

src/Umbraco.Web.UI/web.Template.config

@@ -214,7 +214,9 @@
       <remove fileExtension=".less" />
       <mimeMap fileExtension=".less" mimeType="text/css" />
       <remove fileExtension=".mp4" />
-      <mimeMap fileExtension=".mp4" mimeType="video/mp4" />			
+      <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
+      <remove fileExtension=".json" />
+      <mimeMap fileExtension=".json" mimeType="application/json" />			
     </staticContent>
 
     <!-- Ensure the powered by header is not returned -->