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

Merge pull request #2345 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-12-17 01:49:02 -05:00 committed by GitHub
commit 12f46d961b
10 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Emby.Common.Implementations/project.json
View File

@ -38,22 +38,22 @@
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0",
"System.IO.FileSystem.DriveInfo": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.Threading.Timer": "4.0.1",
"System.Net.Requests": "4.0.11",
"System.Xml.ReaderWriter": "4.0.11",
"System.Xml.XmlSerializer": "4.0.11",
"System.Net.Http": "4.1.0",
"System.Net.Primitives": "4.0.11",
"System.Net.Sockets": "4.1.0",
"System.Net.NetworkInformation": "4.1.0",
"System.Net.NameResolution": "4.0.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Reflection": "4.1.0",
"System.Reflection.Primitives": "4.0.1",
"System.Runtime.Loader": "4.0.0",
"NETStandard.Library": "1.6.1",
"System.IO.FileSystem.DriveInfo": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"System.Threading.Timer": "4.3.0",
"System.Net.Requests": "4.3.0",
"System.Xml.ReaderWriter": "4.3.0",
"System.Xml.XmlSerializer": "4.3.0",
"System.Net.Http": "4.3.0",
"System.Net.Primitives": "4.3.0",
"System.Net.Sockets": "4.3.0",
"System.Net.NetworkInformation": "4.3.0",
"System.Net.NameResolution": "4.3.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"System.Reflection": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Runtime.Loader": "4.3.0",
"SimpleInjector": "3.2.4",
"ServiceStack.Text.Core": "1.0.27",
"NLog": "4.4.0-betaV15",

3
Emby.Dlna/ContentDirectory/ContentDirectory.cs
View File

@ -126,7 +126,8 @@ namespace Emby.Dlna.ContentDirectory
}
// No configuration so it's going to be pretty arbitrary
return _userManager.Users.First();
return _userManager.Users.FirstOrDefault(i => i.Policy.IsAdministrator) ??
_userManager.Users.First();
}
public void Dispose()

12
Emby.Server.Core/project.json
View File

@ -67,13 +67,13 @@
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0",
"NETStandard.Library": "1.6.1",
"System.AppDomain": "2.0.11",
"System.Globalization.Extensions": "4.0.1",
"System.IO.FileSystem.Watcher": "4.0.0",
"System.Net.Security": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Globalization.Extensions": "4.3.0",
"System.IO.FileSystem.Watcher": "4.3.0",
"System.Net.Security": "4.3.0",
"System.Security.Cryptography.X509Certificates": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
"MediaBrowser.Model": {
"target": "project"
},

4
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -308,8 +308,8 @@
<Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project>
<Name>SocketHttpListener.Portable</Name>
</ProjectReference>
<Reference Include="Emby.XmlTv, Version=1.0.6175.23736, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Emby.XmlTv.1.0.2\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
<Reference Include="Emby.XmlTv, Version=1.0.6193.39741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Emby.XmlTv.1.0.3\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MediaBrowser.Naming, Version=1.0.6178.4191, Culture=neutral, processorArchitecture=MSIL">

2
Emby.Server.Implementations/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Emby.XmlTv" version="1.0.2" targetFramework="portable45-net45+win8" />
<package id="Emby.XmlTv" version="1.0.3" targetFramework="portable45-net45+win8" />
<package id="MediaBrowser.Naming" version="1.0.3" targetFramework="portable45-net45+win8" />
<package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
<package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="portable45-net45+win8" />

2
MediaBrowser.Api/UserLibrary/UserViewsService.cs
View File

@ -97,6 +97,8 @@ namespace MediaBrowser.Api.UserLibrary
var dtoOptions = GetDtoOptions(_authContext, request);
dtoOptions.Fields.Add(ItemFields.PrimaryImageAspectRatio);
dtoOptions.Fields.Add(ItemFields.DisplayPreferencesId);
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
dtoOptions.Fields.Remove(ItemFields.BasicSyncInfo);
var user = _userManager.GetUserById(request.UserId);

2
MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
View File

@ -42,7 +42,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
MediaBrowser.Server.Startup.Common/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ini-parser" version="2.3.0" targetFramework="net46" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.0" targetFramework="net46" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net46" />
</packages>

4
Mono.Nat/project.json
View File

@ -27,14 +27,14 @@
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0",
"NETStandard.Library": "1.6.1",
"MediaBrowser.Common": {
"target": "project"
},
"MediaBrowser.Model": {
"target": "project"
},
"System.Net.NetworkInformation": "4.1.0"
"System.Net.NetworkInformation": "4.3.0"
}
}
}

8
src/Emby.Server/project.json
View File

@ -12,10 +12,10 @@
"version": "1.1.0"
},
"Mono.Nat": "1.0.0-*",
"Microsoft.Win32.Registry": "4.0.0",
"System.Runtime.Extensions": "4.1.0",
"System.Diagnostics.Process": "4.1.0",
"SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1-pre20161109081005"
"System.Runtime.Extensions": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"Microsoft.Win32.Registry": "4.3.0",
"SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1"
},
"runtimes": {