mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
b483288f9b
@ -286,7 +286,7 @@ namespace MediaBrowser.Api.Playback
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
var param = string.Format(",ass={0}", path);
|
||||
var param = string.Format(",ass={0}", path.Replace('\\', '/').Replace(":/", "\\:/"));
|
||||
|
||||
if (startTimeTicks.HasValue)
|
||||
{
|
||||
|
@ -35,7 +35,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
[Route("/Videos/{Id}/stream.avi", "HEAD")]
|
||||
[Route("/Videos/{Id}/stream.m2ts", "HEAD")]
|
||||
[Route("/Videos/{Id}/stream", "HEAD")]
|
||||
[ServiceStack.ServiceHost.Api(Description = "Gets a video stream")]
|
||||
[Api(Description = "Gets a video stream")]
|
||||
public class GetVideoStream : VideoStreamRequest
|
||||
{
|
||||
|
||||
|
@ -537,7 +537,6 @@ namespace MediaBrowser.Controller.Library
|
||||
/// </summary>
|
||||
/// <param name="dto">The dto.</param>
|
||||
/// <param name="item">The item.</param>
|
||||
/// <param name="libraryManager">The library manager.</param>
|
||||
/// <returns>Task.</returns>
|
||||
private async Task AttachPeople(BaseItemDto dto, BaseItem item)
|
||||
{
|
||||
@ -549,7 +548,7 @@ namespace MediaBrowser.Controller.Library
|
||||
// Attach People by transforming them into BaseItemPerson (DTO)
|
||||
dto.People = new BaseItemPerson[item.People.Count];
|
||||
|
||||
var entities = await Task.WhenAll(item.People.Select(c =>
|
||||
var entities = await Task.WhenAll(item.People.OrderBy(i => i.Type).Select(c =>
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
|
@ -139,7 +139,7 @@ namespace MediaBrowser.Model.Entities
|
||||
/// </summary>
|
||||
/// <value>The level.</value>
|
||||
[ProtoMember(19)]
|
||||
public double Level { get; set; }
|
||||
public double? Level { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -454,7 +454,9 @@ namespace MediaBrowser.WebDashboard.Api
|
||||
{
|
||||
"extensions.js",
|
||||
"site.js",
|
||||
"videojsextensions.js",
|
||||
"librarybrowser.js",
|
||||
|
||||
"aboutpage.js",
|
||||
"addpluginpage.js",
|
||||
"advancedconfigurationpage.js",
|
||||
|
@ -233,6 +233,9 @@
|
||||
<Content Include="dashboard-ui\scripts\tvshows.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\scripts\videojsextensions.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\thirdparty\jplayer\jplayer.playlist.min.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>MediaBrowser.Common.Internal</id>
|
||||
<version>3.0.63</version>
|
||||
<version>3.0.64</version>
|
||||
<title>MediaBrowser.Common.Internal</title>
|
||||
<authors>Luke</authors>
|
||||
<owners>ebr,Luke,scottisafool</owners>
|
||||
@ -12,7 +12,7 @@
|
||||
<description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
|
||||
<copyright>Copyright © Media Browser 2013</copyright>
|
||||
<dependencies>
|
||||
<dependency id="MediaBrowser.Common" version="3.0.63" />
|
||||
<dependency id="MediaBrowser.Common" version="3.0.64" />
|
||||
<dependency id="NLog" version="2.0.0.2000" />
|
||||
<dependency id="ServiceStack.Text" version="3.9.38" />
|
||||
<dependency id="protobuf-net" version="2.0.0.621" />
|
||||
|
@ -2,7 +2,7 @@
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>MediaBrowser.Common</id>
|
||||
<version>3.0.63</version>
|
||||
<version>3.0.64</version>
|
||||
<title>MediaBrowser.Common</title>
|
||||
<authors>Media Browser Team</authors>
|
||||
<owners>ebr,Luke,scottisafool</owners>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>MediaBrowser.Server.Core</id>
|
||||
<version>3.0.63</version>
|
||||
<version>3.0.64</version>
|
||||
<title>Media Browser.Server.Core</title>
|
||||
<authors>Media Browser Team</authors>
|
||||
<owners>ebr,Luke,scottisafool</owners>
|
||||
@ -12,7 +12,7 @@
|
||||
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
||||
<copyright>Copyright © Media Browser 2013</copyright>
|
||||
<dependencies>
|
||||
<dependency id="MediaBrowser.Common" version="3.0.63" />
|
||||
<dependency id="MediaBrowser.Common" version="3.0.64" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
|
Loading…
Reference in New Issue
Block a user