aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Api/System/SystemService.cs3
-rw-r--r--MediaBrowser.Model/System/PublicSystemInfo.cs6
-rw-r--r--MediaBrowser.Model/System/SystemInfo.cs11
-rw-r--r--MediaBrowser.Server.Mac/Emby.Server.Mac.csproj81
4 files changed, 86 insertions, 15 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index 0a49cf47c..aa1226901 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 3afe72e81..b9a3260b0 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -27,6 +27,12 @@ namespace MediaBrowser.Model.System
public string Version { get; set; }
/// <summary>
+ /// Gets or sets the operating sytem.
+ /// </summary>
+ /// <value>The operating sytem.</value>
+ public string OperatingSystem { get; set; }
+
+ /// <summary>
/// Gets or sets the id.
/// </summary>
/// <value>The id.</value>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 094c4fda6..c8209baa8 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -9,11 +9,6 @@ namespace MediaBrowser.Model.System
public class SystemInfo : PublicSystemInfo
{
/// <summary>
- /// Gets or sets the operating sytem.
- /// </summary>
- /// <value>The operating sytem.</value>
- public string OperatingSystem { get; set; }
- /// <summary>
/// Gets or sets the display name of the operating system.
/// </summary>
/// <value>The display name of the operating system.</value>
@@ -30,7 +25,7 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value><c>true</c> if [supports running as service]; otherwise, <c>false</c>.</value>
public bool SupportsRunningAsService { get; set; }
-
+
/// <summary>
/// Gets or sets the mac address.
/// </summary>
@@ -108,7 +103,7 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value>The cache path.</value>
public string CachePath { get; set; }
-
+
/// <summary>
/// Gets or sets the log path.
/// </summary>
@@ -120,7 +115,7 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value>The internal metadata path.</value>
public string InternalMetadataPath { get; set; }
-
+
/// <summary>
/// Gets or sets the transcoding temporary path.
/// </summary>
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index b2d812434..c0a48d46b 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -259,6 +259,9 @@
</BundleResource>
<BundleResource Include="Resources\appicon.icns" />
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\.DS_Store">
+ <Link>Resources\dashboard-ui\.DS_Store</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">
<Link>Resources\dashboard-ui\about.html</Link>
</BundleResource>
@@ -709,6 +712,57 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\font-roboto\roboto.html">
<Link>Resources\dashboard-ui\bower_components\font-roboto\roboto.html</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.bower.json">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.bower.json</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.bowerrc">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.bowerrc</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.gitignore">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.gitignore</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.jscsrc">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.jscsrc</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.jshintrc">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.jshintrc</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.travis.yml">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\.travis.yml</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CHANGELOG.md">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\CHANGELOG.md</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\Gruntfile.coffee">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\Gruntfile.coffee</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\LICENSE.md">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\LICENSE.md</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\README.md">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\README.md</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\bower.json">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\bower.json</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\component.json">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\component.json</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.js">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.js</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.min.js">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.min.map">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.min.map</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\package.json">
+ <Link>Resources\dashboard-ui\bower_components\hammerjs\package.json</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-a11y-announcer\.bower.json">
<Link>Resources\dashboard-ui\bower_components\iron-a11y-announcer\.bower.json</Link>
</BundleResource>
@@ -2104,9 +2158,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-checkbox\metadata.html">
<Link>Resources\dashboard-ui\bower_components\paper-checkbox\metadata.html</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.css">
- <Link>Resources\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.css</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.html">
<Link>Resources\dashboard-ui\bower_components\paper-checkbox\paper-checkbox.html</Link>
</BundleResource>
@@ -2851,9 +2902,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-toggle-button\index.html">
<Link>Resources\dashboard-ui\bower_components\paper-toggle-button\index.html</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.css">
- <Link>Resources\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.css</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.html">
<Link>Resources\dashboard-ui\bower_components\paper-toggle-button\paper-toggle-button.html</Link>
</BundleResource>
@@ -3211,6 +3259,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\cordova\ios\orientation.js">
<Link>Resources\dashboard-ui\cordova\ios\orientation.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\.DS_Store">
+ <Link>Resources\dashboard-ui\css\.DS_Store</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">
<Link>Resources\dashboard-ui\css\card.css</Link>
</BundleResource>
@@ -4420,6 +4471,24 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\custombuild.txt">
<Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\custombuild.txt</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.css">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.css</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.css">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.css</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.js">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.js</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.css">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.css</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js">
+ <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.css">
<Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.css</Link>
</BundleResource>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-15 19:05:44 +0000