lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2899 from MediaBrowser/beta

Browse Source 
Beta
This commit is contained in:
Luke 2017-09-20 13:41:00 -04:00 committed by GitHub
commit 8117d31d2f
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,9 +258,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\appservices.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\appservices.html">
<Link>Resources\dashboard-ui\appservices.html</Link> <Link>Resources\dashboard-ui\appservices.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\autoorganizelog.html">
<Link>Resources\dashboard-ui\autoorganizelog.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\camerauploadsettings.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\camerauploadsettings.html">
<Link>Resources\dashboard-ui\camerauploadsettings.html</Link> <Link>Resources\dashboard-ui\camerauploadsettings.html</Link>
</BundleResource> </BundleResource>
@ -2388,9 +2385,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js">
<Link>Resources\dashboard-ui\scripts\pluginspage.js</Link> <Link>Resources\dashboard-ui\scripts\pluginspage.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\reports.js">
<Link>Resources\dashboard-ui\scripts\reports.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\scheduledtaskpage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\scheduledtaskpage.js">
<Link>Resources\dashboard-ui\scripts\scheduledtaskpage.js</Link> <Link>Resources\dashboard-ui\scripts\scheduledtaskpage.js</Link>
</BundleResource> </BundleResource>

16
MediaBrowser.Server.Mac/MacAppHost.cs
View File

@ -90,25 +90,9 @@ namespace MediaBrowser.Server.Mac
throw new NotImplementedException(); throw new NotImplementedException();
} }
public override bool SupportsRunningAsService
{
get
{
return false;
}
}
public override bool SupportsAutoRunAtStartup public override bool SupportsAutoRunAtStartup
{ {
get { return false; } get { return false; }
} }
public override bool IsRunningAsService
{
get
{
return false;
}
}
} }
} }