From 73e14851e3f8d7658dae55dcf54b999d7426399a Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 2 Sep 2015 21:53:38 -0400 Subject: [PATCH 1/3] update mac project --- .../Emby.Server.Mac.csproj | 81 +++++++++++++++++-- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index b2d8124343..c0a48d46b8 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -259,6 +259,9 @@ + + Resources\dashboard-ui\.DS_Store + Resources\dashboard-ui\about.html @@ -709,6 +712,57 @@ Resources\dashboard-ui\bower_components\font-roboto\roboto.html + + Resources\dashboard-ui\bower_components\hammerjs\.bower.json + + + Resources\dashboard-ui\bower_components\hammerjs\.bowerrc + + + Resources\dashboard-ui\bower_components\hammerjs\.gitignore + + + Resources\dashboard-ui\bower_components\hammerjs\.jscsrc + + + Resources\dashboard-ui\bower_components\hammerjs\.jshintrc + + + Resources\dashboard-ui\bower_components\hammerjs\.travis.yml + + + Resources\dashboard-ui\bower_components\hammerjs\CHANGELOG.md + + + Resources\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md + + + Resources\dashboard-ui\bower_components\hammerjs\Gruntfile.coffee + + + Resources\dashboard-ui\bower_components\hammerjs\LICENSE.md + + + Resources\dashboard-ui\bower_components\hammerjs\README.md + + + Resources\dashboard-ui\bower_components\hammerjs\bower.json + + + Resources\dashboard-ui\bower_components\hammerjs\component.json + + + Resources\dashboard-ui\bower_components\hammerjs\hammer.js + + + Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js + + + Resources\dashboard-ui\bower_components\hammerjs\hammer.min.map + + + Resources\dashboard-ui\bower_components\hammerjs\package.json + Resources\dashboard-ui\bower_components\iron-a11y-announcer\.bower.json @@ -2104,9 +2158,6 @@ Resources\dashboard-ui\bower_components\paper-checkbox\metadata.html - - Resources\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.css - Resources\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.html @@ -2851,9 +2902,6 @@ Resources\dashboard-ui\bower_components\paper-toggle-button\index.html - - Resources\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.css - Resources\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.html @@ -3211,6 +3259,9 @@ Resources\dashboard-ui\cordova\ios\orientation.js + + Resources\dashboard-ui\css\.DS_Store + Resources\dashboard-ui\css\card.css @@ -4420,6 +4471,24 @@ Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\custombuild.txt + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.css From 16e4d4599af157f94883412d050b792b97c116f6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 5 Sep 2015 13:19:13 -0400 Subject: [PATCH 2/3] fix directory browser in startup wizard --- MediaBrowser.Api/System/SystemService.cs | 3 ++- MediaBrowser.Model/System/PublicSystemInfo.cs | 6 ++++++ MediaBrowser.Model/System/SystemInfo.cs | 11 +++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs index 0a49cf47cf..aa12269019 100644 --- a/MediaBrowser.Api/System/SystemService.cs +++ b/MediaBrowser.Api/System/SystemService.cs @@ -178,7 +178,8 @@ namespace MediaBrowser.Api.System ServerName = result.ServerName, Version = result.Version, LocalAddress = result.LocalAddress, - WanAddress = result.WanAddress + WanAddress = result.WanAddress, + OperatingSystem = result.OperatingSystem }; return ToOptimizedResult(publicInfo); diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs index 3afe72e818..b9a3260b01 100644 --- a/MediaBrowser.Model/System/PublicSystemInfo.cs +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -26,6 +26,12 @@ namespace MediaBrowser.Model.System /// The version. public string Version { get; set; } + /// + /// Gets or sets the operating sytem. + /// + /// The operating sytem. + public string OperatingSystem { get; set; } + /// /// Gets or sets the id. /// diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 094c4fda62..c8209baa85 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -8,11 +8,6 @@ namespace MediaBrowser.Model.System /// public class SystemInfo : PublicSystemInfo { - /// - /// Gets or sets the operating sytem. - /// - /// The operating sytem. - public string OperatingSystem { get; set; } /// /// Gets or sets the display name of the operating system. /// @@ -30,7 +25,7 @@ namespace MediaBrowser.Model.System /// /// true if [supports running as service]; otherwise, false. public bool SupportsRunningAsService { get; set; } - + /// /// Gets or sets the mac address. /// @@ -108,7 +103,7 @@ namespace MediaBrowser.Model.System /// /// The cache path. public string CachePath { get; set; } - + /// /// Gets or sets the log path. /// @@ -120,7 +115,7 @@ namespace MediaBrowser.Model.System /// /// The internal metadata path. public string InternalMetadataPath { get; set; } - + /// /// Gets or sets the transcoding temporary path. /// From b3bdb3b21dea4a88a2666e9ea80edd2c17e6ef6d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 5 Sep 2015 13:23:45 -0400 Subject: [PATCH 3/3] 3.0.5724.4 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 6bf7a6de10..36853f5e27 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5724.3")] +[assembly: AssemblyVersion("3.0.5724.4")]