yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan
2015-09-18 13:41:54 +02:00
parent 9c9ba477aa 91a1955454
commit ae7a9a2fed
14 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SolutionInfo.cs
View File

@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.3.0")]
[assembly: AssemblyInformationalVersion("7.3.0-RC")]
[assembly: AssemblyInformationalVersion("7.3.0")]

2
src/Umbraco.Core/Configuration/UmbracoVersion.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
/// </summary>
/// <value>The version comment.</value>
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

28
src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs Normal file
View File

@@ -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
{
/// <summary>
/// Ensures that the culture is set correctly for the current back office user
/// </summary>
/// <param name="context"/>
/// <returns/>
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);
}
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -460,6 +460,7 @@
<Compile Include="Publishing\UnPublishedStatusType.cs" />
<Compile Include="Publishing\UnPublishStatus.cs" />
<Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
<Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
<Compile Include="Security\BackOfficeSignInManager.cs" />
<Compile Include="Security\BackOfficeUserManager.cs" />
<Compile Include="Security\BackOfficeUserStore.cs" />

6
src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
View File

@@ -49,11 +49,9 @@ namespace Umbraco.Tests.Migrations
{
CanResolveBeforeFrozen = true
};
//SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
Resolution.Freeze();
//SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
}
[Test]

2
src/Umbraco.Web.UI.Client/src/common/directives/html/umbavatar.directive.js
View File

@@ -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";
});
}

2
src/Umbraco.Web.UI.Client/src/common/services/user.service.js
View File

@@ -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);
});

2
src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
View File

@@ -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);

2
src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
View File

@@ -11,7 +11,7 @@
<div id="video_1" class="video_player" style="margin-bottom: 40px">
<video autoplay loop>
<!-- <source src="videos/gif.webm" type="video/webm"> -->
<source src="//player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
<source src="https://player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
Sorry, you don't have HTML5 video and we didn't catch this properly in javascript.
</video>
</div>

8
src/Umbraco.Web.UI/config/splashes/noNodes.aspx
View File

@@ -16,13 +16,13 @@
<meta name="description" content="">
<meta name="author" content="">
<link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700,600' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Asap:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,700,600' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Asap:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="../../Umbraco/assets/css/nonodes.style.min.css" />
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
<![endif]-->
</head>
@@ -62,7 +62,7 @@
</section>
<script src="//code.jquery.com/jquery-latest.min.js"></script>
<script src="https://code.jquery.com/jquery-latest.min.js"></script>
</body>
</html>

34
src/Umbraco.Web.UI/web.Template.Release.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
<!--
CAREFUL!
========
@@ -9,22 +9,24 @@
Umbraco RELEASE version - The version that everybody will download and use
-->
<system.web>
<trust xdt:Transform="Remove" />
<globalization xdt:Transform="Remove" />
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
</customErrors>
<system.web>
<trust xdt:Transform="Remove" />
<globalization xdt:Transform="Remove" />
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
</customErrors>
<membership>
<providers>
<add xdt:Transform="SetAttributes(useLegacyEncoding)" xdt:Locator="Match(name)" name="UmbracoMembershipProvider"
useLegacyEncoding="true" />
<add xdt:Transform="SetAttributes(useLegacyEncoding)" xdt:Locator="Match(name)" name="UsersMembershipProvider"
useLegacyEncoding="true" />
</providers>
</membership>
</system.web>
<membership>
<providers>
<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UmbracoMembershipProvider"
minRequiredPasswordLength="8"
useLegacyEncoding="true" />
<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UsersMembershipProvider"
minRequiredPasswordLength="8"
useLegacyEncoding="true" />
</providers>
</membership>
</system.web>
</configuration>

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -250,7 +250,7 @@
<!-- Ensure correct version of HtmlAgilityPack -->
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
</dependentAssembly>
<dependentAssembly>

4
src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
View File

@@ -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<BackOfficeUserManager, BackOfficeIdentityUser, int>(
TimeSpan.FromMinutes(30),
(manager, user) => user.GenerateUserIdentityAsync(manager),
identity => identity.GetUserId<int>())
identity => identity.GetUserId<int>()),
}
};