cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1172 from MediaBrowser/master

Browse Source 
merge
This commit is contained in:
Luke 2015-09-05 13:29:22 -04:00
commit 9ba4ea5250
4 changed files with 86 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Api/System/SystemService.cs
View File

@ -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);

6
MediaBrowser.Model/System/PublicSystemInfo.cs
View File

@ -26,6 +26,12 @@ namespace MediaBrowser.Model.System
/// <value>The version.</value>
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>

11
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -8,11 +8,6 @@ namespace MediaBrowser.Model.System
/// </summary>
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>
@ -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>

81
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -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>