michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2569 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-04-08 14:32:24 -04:00 committed by GitHub
commit e25c538ac7
7 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; 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 public MediaBrowser.Model.System.Architecture SystemArchitecture
{ {
get get

2
MediaBrowser.Api/UserService.cs
View File

@ -461,7 +461,7 @@ namespace MediaBrowser.Api
{ {
var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false); 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."); throw new ArgumentException("Invalid user or password entered.");
} }

1
MediaBrowser.Model/System/IEnvironmentInfo.cs
View File

@ -11,6 +11,7 @@ namespace MediaBrowser.Model.System
void SetProcessEnvironmentVariable(string name, string value); void SetProcessEnvironmentVariable(string name, string value);
string GetUserId(); string GetUserId();
string StackTrace { get; } string StackTrace { get; }
char PathSeparator { get; }
} }
public enum OperatingSystem public enum OperatingSystem

3
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -734,6 +734,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\globalize.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\globalize.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homesections.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homesections.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\idb.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\idb.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js</Link>
</BundleResource> </BundleResource>

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.697</version> <version>3.0.698</version>
<title>Emby.Common</title> <title>Emby.Common</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

2
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.697</version> <version>3.0.698</version>
<title>Emby.Server.Core</title> <title>Emby.Server.Core</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.11.1")] [assembly: AssemblyVersion("3.2.12.1")]