diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index 7cb235f023..ed2ae80c6e 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,3 +1,2 @@
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.3.0
-RC
\ No newline at end of file
+7.3.0
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index ae85cd82ea..6c766f8e97 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.3.0")]
-[assembly: AssemblyInformationalVersion("7.3.0-RC")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.3.0")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 30f59875e8..e61d091d84 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
///
/// The version comment.
- public static string CurrentComment { get { return "RC"; } }
+ public static string CurrentComment { get { return ""; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
diff --git a/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
new file mode 100644
index 0000000000..5247ea0af4
--- /dev/null
+++ b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -0,0 +1,28 @@
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Owin.Security.Cookies;
+
+namespace Umbraco.Core.Security
+{
+ public class BackOfficeCookieAuthenticationProvider : CookieAuthenticationProvider
+ {
+ ///
+ /// Ensures that the culture is set correctly for the current back office user
+ ///
+ ///
+ ///
+ public override Task ValidateIdentity(CookieValidateIdentityContext context)
+ {
+ var umbIdentity = context.Identity as UmbracoBackOfficeIdentity;
+ if (umbIdentity != null && umbIdentity.IsAuthenticated)
+ {
+ Thread.CurrentThread.CurrentCulture =
+ Thread.CurrentThread.CurrentUICulture =
+ new CultureInfo(umbIdentity.Culture);
+ }
+
+ return base.ValidateIdentity(context);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 80e56449bb..15e00bcb8f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -460,6 +460,7 @@
+
diff --git a/src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs b/src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
index 77c706a699..eb3c36ce42 100644
--- a/src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
+++ b/src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
@@ -49,11 +49,9 @@ namespace Umbraco.Tests.Migrations
{
CanResolveBeforeFrozen = true
};
- //SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
-
+
Resolution.Freeze();
-
- //SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
+
}
[Test]
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbavatar.directive.js
index 35a94008d4..5979d07095 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbavatar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbavatar.directive.js
@@ -17,7 +17,7 @@ function avatarDirective() {
scope.$watch("hash", function (val) {
//set the gravatar url
- scope.gravatar = "//www.gravatar.com/avatar/" + val + "?s=40";
+ scope.gravatar = "https://www.gravatar.com/avatar/" + val + "?s=40";
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index a73e51e54d..7ad3f0e289 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -250,7 +250,7 @@ angular.module('umbraco.services')
}
setCurrentUser(data);
- currentUser.avatar = '//www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
+ currentUser.avatar = 'https://www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
deferred.resolve(currentUser);
});
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index e524f8e49e..08185a156a 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -91,7 +91,7 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
$timeout(function () {
//this can be null if they time out
if ($scope.user && $scope.user.emailHash) {
- $scope.avatar = "//www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
+ $scope.avatar = "https://www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
}
});
$("#avatar-img").fadeTo(1000, 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
index 1e7aa3bf9e..018c520c52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
@@ -11,7 +11,7 @@