From 46ece1dbc2aba4d388a91f539f4218aa49e9c0c2 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 7 Apr 2017 23:38:42 -0400 Subject: [PATCH 1/3] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index bb67a9e36..834220f9c 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -734,6 +734,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\homesections.js + Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js From 48ad0ad93bc83fb11c3849596d8420350af80dbf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 8 Apr 2017 14:31:18 -0400 Subject: [PATCH 2/3] update linux iso mounter --- .../EnvironmentInfo/EnvironmentInfo.cs | 9 +++++++++ MediaBrowser.Api/UserService.cs | 2 +- MediaBrowser.Model/System/IEnvironmentInfo.cs | 1 + Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index 5da1ae2dc..ad6e35700 100644 --- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs +++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; @@ -75,6 +76,14 @@ namespace Emby.Common.Implementations.EnvironmentInfo } } + public char PathSeparator + { + get + { + return Path.PathSeparator; + } + } + public MediaBrowser.Model.System.Architecture SystemArchitecture { get diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index bbae918a1..fde03e1f2 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -461,7 +461,7 @@ namespace MediaBrowser.Api { var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false); - if (success != null) + if (success == null) { throw new ArgumentException("Invalid user or password entered."); } diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 2c57df97c..4430bfe07 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Model.System void SetProcessEnvironmentVariable(string name, string value); string GetUserId(); string StackTrace { get; } + char PathSeparator { get; } } public enum OperatingSystem diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 54133b718..20681b317 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.697 + 3.0.698 Emby.Common Emby Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index e59460c94..7b5f348c8 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.697 + 3.0.698 Emby.Server.Core Emby Team ebr,Luke,scottisafool From 78eebc04500e63c5a6b5e79cc52b1825940c40df Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 8 Apr 2017 14:31:43 -0400 Subject: [PATCH 3/3] 3.2.12.1 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index ec6a055e8..3daabe507 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.11.1")] +[assembly: AssemblyVersion("3.2.12.1")]