From ff0e45a3f7fe89dd726ebe591028b14c010c824e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 26 Mar 2016 13:52:36 -0400 Subject: [PATCH 1/4] 3.0.5921 --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index f2ac1e3a3c..e0c8719c14 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5910")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5921")] From e73b418f9da82df8fdb443978228e350b9fe1bf2 Mon Sep 17 00:00:00 2001 From: Sven Van den brande Date: Sun, 27 Mar 2016 22:35:25 +0200 Subject: [PATCH 2/4] Fix typo --- .../MediaEncoder/EncodingManager.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs index ac0f2c69da..a7b0d61c7c 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Controller.Chapters; +using MediaBrowser.Controller.Chapters; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; @@ -153,7 +152,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } catch (Exception ex) { - _logger.ErrorException("Error extraching chapter images for {0}", ex, string.Join(",", inputPath)); + _logger.ErrorException("Error extracting chapter images for {0}", ex, string.Join(",", inputPath)); success = false; break; } From 37e55ba6377028cd0ebc2a0b228eca5924de66eb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 27 Mar 2016 18:47:58 -0400 Subject: [PATCH 3/4] 3.0.5911 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index e0c8719c14..f6c35210c0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5921")] +[assembly: AssemblyVersion("3.0.5911")] From fe482f3ac352b68375797ad6c1353969ea55e980 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 27 Mar 2016 19:11:27 -0400 Subject: [PATCH 4/4] update mac release --- MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index c48f609ae0..33df83b2fc 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac return list; } - public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory) + public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory) { }