From 23f7a4e53f2a4c1c54501d59cc154b6339eaf919 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 16 Sep 2015 14:32:56 +0200 Subject: [PATCH 1/6] Set min password length is 8 characters by default for release --- .../web.Template.Release.config | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Web.UI/web.Template.Release.config b/src/Umbraco.Web.UI/web.Template.Release.config index 0745ffe7ae..3ddea3b6a6 100644 --- a/src/Umbraco.Web.UI/web.Template.Release.config +++ b/src/Umbraco.Web.UI/web.Template.Release.config @@ -1,7 +1,7 @@ - - - - - - - + + + + + + - - - - - - - + + + + + + + \ No newline at end of file From 65969e22a0280bbbb64fd95c61b64c3f8cdb1023 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 16 Sep 2015 14:33:30 +0200 Subject: [PATCH 2/6] removes commented out code --- src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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] From 779dd26527907a59d246c95fb1f30d0c386f43b7 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 16 Sep 2015 15:22:40 +0200 Subject: [PATCH 3/6] Fixes: U4-6969 Property label localization in 7.3 always uses en-US locale --- .../BackOfficeCookieAuthenticationProvider.cs | 28 +++++++++++++++++++ src/Umbraco.Core/Umbraco.Core.csproj | 1 + .../Security/Identity/AppBuilderExtensions.cs | 4 +-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs 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 2ea422c3a6..4552cac7f5 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -459,6 +459,7 @@ + diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs index 11bdf48897..317ae7f729 100644 --- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs +++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs @@ -134,7 +134,7 @@ namespace Umbraco.Web.Security.Identity GlobalSettings.TimeOutInMinutes, GlobalSettings.UseSSL) { - Provider = new CookieAuthenticationProvider + Provider = new BackOfficeCookieAuthenticationProvider { // Enables the application to validate the security stamp when the user // logs in. This is a security feature which is used when you @@ -143,7 +143,7 @@ namespace Umbraco.Web.Security.Identity .OnValidateIdentity( TimeSpan.FromMinutes(30), (manager, user) => user.GenerateUserIdentityAsync(manager), - identity => identity.GetUserId()) + identity => identity.GetUserId()), } }; From b9dd0ab1a9398089dd94c5018c93bfeca3bb0a9f Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 16 Sep 2015 18:58:45 +0200 Subject: [PATCH 4/6] Bump version --- build/UmbracoVersion.txt | 3 +-- src/SolutionInfo.cs | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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 From 1f3c396c5b5b4a1b92c485fca816f4b435909347 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 16 Sep 2015 19:00:14 +0200 Subject: [PATCH 5/6] Using protocol-relative URLs is an antipattern, just use https if you know it exists --- .../src/common/directives/html/umbavatar.directive.js | 2 +- .../src/common/services/user.service.js | 2 +- .../src/controllers/main.controller.js | 2 +- .../src/views/dashboard/forms/formsdashboardintro.html | 2 +- src/Umbraco.Web.UI/config/splashes/noNodes.aspx | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) 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 @@
diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx index 38415e3222..625ee5a653 100644 --- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx +++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx @@ -16,13 +16,13 @@ - - + + @@ -62,7 +62,7 @@ - + \ No newline at end of file From 91a1955454f20048d6406ae7ddfd07c5fec808ac Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 17 Sep 2015 12:20:11 +0200 Subject: [PATCH 6/6] Make sure to redirect to the current version of HTML Agility Pack --- src/Umbraco.Web.UI/web.Template.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index b3d69ff778..221aecfbd0 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -250,7 +250,7 @@ - +