mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 11:57:55 +02:00
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
bc6d28222a
1 changed files with 34 additions and 19 deletions
|
@ -257,22 +257,9 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="statusicon.png" />
|
<Content Include="statusicon.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
|
|
||||||
<IsCxx>False</IsCxx>
|
|
||||||
<Kind>Dynamic</Kind>
|
|
||||||
</NativeReference>
|
|
||||||
<NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.dylib">
|
|
||||||
<IsCxx>False</IsCxx>
|
|
||||||
<Kind>Dynamic</Kind>
|
|
||||||
</NativeReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BundleResource Include="Resources\appicon.icns" />
|
<BundleResource Include="Resources\appicon.icns" />
|
||||||
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
|
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">
|
|
||||||
<Link>Resources\dashboard-ui\about.html</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\addplugin.html">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\addplugin.html">
|
||||||
<Link>Resources\dashboard-ui\addplugin.html</Link>
|
<Link>Resources\dashboard-ui\addplugin.html</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -960,6 +947,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\nullassetmanager.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\nullassetmanager.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -975,6 +965,12 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\contentuploader.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\contentuploader.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\contentuploader.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\contentuploader.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\filerepository.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\filerepository.js</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\itemrepository.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\itemrepository.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\localsync.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\localsync.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\localsync.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\localsync.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -990,6 +986,15 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\transfermanager.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\transfermanager.js</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\useractionrepository.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\useractionrepository.js</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\userrepository.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\userrepository.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\.bower.json">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\.bower.json">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1038,6 +1043,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\globalize.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\globalize.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\idb.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\inputmanager.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\inputmanager.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\inputmanager.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\inputmanager.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1407,12 +1415,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.js">
|
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.template.html">
|
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.template.html</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1806,6 +1808,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\sync\sync.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\sync\sync.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\sync\sync.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\sync\sync.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\sync\synctoggle.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\sync\synctoggle.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -3616,4 +3621,14 @@
|
||||||
<Link>Resources\dashboard-ui\thirdparty\jstree\themes\default\throbber.gif</Link>
|
<Link>Resources\dashboard-ui\thirdparty\jstree\themes\default\throbber.gif</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
|
||||||
|
<Kind>Dynamic</Kind>
|
||||||
|
<SmartLink>False</SmartLink>
|
||||||
|
</NativeReference>
|
||||||
|
<NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.dylib">
|
||||||
|
<Kind>Dynamic</Kind>
|
||||||
|
<SmartLink>False</SmartLink>
|
||||||
|
</NativeReference>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
Loading…
Reference in a new issue