michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/Emby

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-04 00:48:01 -04:00
commit 73729ca242
1 changed files with 9 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,6 +618,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\serversecurity.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\serversecurity.html">
<Link>Resources\dashboard-ui\serversecurity.html</Link> <Link>Resources\dashboard-ui\serversecurity.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\serviceworker.js">
<Link>Resources\dashboard-ui\serviceworker.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\shared.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\shared.html">
<Link>Resources\dashboard-ui\shared.html</Link> <Link>Resources\dashboard-ui\shared.html</Link>
</BundleResource> </BundleResource>
@ -1011,9 +1014,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\connectionmanager.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\connectionmanager.js">
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\connectionmanager.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-apiclient\connectionmanager.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\connectservice.js">
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\connectservice.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\credentials.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\credentials.js">
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\credentials.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-apiclient\credentials.js</Link>
</BundleResource> </BundleResource>
@ -1107,9 +1107,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\librarychangednotifications.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\librarychangednotifications.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\multidownload.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\multidownload.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\multidownload.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\multidownload.js</Link>
</BundleResource> </BundleResource>
@ -1512,6 +1509,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\notifications\notificationicon.png">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\notificationicon.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\notifications\notifications.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\notifications.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js</Link>
</BundleResource> </BundleResource>
@ -2499,63 +2502,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\test\letters-only.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\test\letters-only.html">
<Link>Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html</Link> <Link>Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\.bower.json">
<Link>Resources\dashboard-ui\bower_components\iron-location\.bower.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\.gitignore">
<Link>Resources\dashboard-ui\bower_components\iron-location\.gitignore</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\.travis.yml">
<Link>Resources\dashboard-ui\bower_components\iron-location\.travis.yml</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\CONTRIBUTING.md">
<Link>Resources\dashboard-ui\bower_components\iron-location\CONTRIBUTING.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\README.md">
<Link>Resources\dashboard-ui\bower_components\iron-location\README.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\bower.json">
<Link>Resources\dashboard-ui\bower_components\iron-location\bower.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\index.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\iron-location.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\iron-location.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\iron-query-params.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\iron-query-params.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md">
<Link>Resources\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\demo\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\demo\index.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\demo\iron-query-params.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\demo\iron-query-params.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\index.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\initialization-cases.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\initialization-cases.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\initialization-iframe.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\initialization-iframe.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\initialization-tests.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\initialization-tests.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\iron-location.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\iron-location.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\iron-query-params.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\iron-query-params.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\test\redirection.html">
<Link>Resources\dashboard-ui\bower_components\iron-location\test\redirection.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-meta\.bower.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-meta\.bower.json">
<Link>Resources\dashboard-ui\bower_components\iron-meta\.bower.json</Link> <Link>Resources\dashboard-ui\bower_components\iron-meta\.bower.json</Link>
</BundleResource> </BundleResource>
@ -3885,9 +3831,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\ani_equalizer_white.gif"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\ani_equalizer_white.gif">
<Link>Resources\dashboard-ui\css\images\ani_equalizer_white.gif</Link> <Link>Resources\dashboard-ui\css\images\ani_equalizer_white.gif</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\checkmarkblack.png">
<Link>Resources\dashboard-ui\css\images\checkmarkblack.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\checkmarkgreen.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\checkmarkgreen.png">
<Link>Resources\dashboard-ui\css\images\checkmarkgreen.png</Link> <Link>Resources\dashboard-ui\css\images\checkmarkgreen.png</Link>
</BundleResource> </BundleResource>
@ -3921,15 +3864,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\rotten.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\rotten.png">
<Link>Resources\dashboard-ui\css\images\rotten.png</Link> <Link>Resources\dashboard-ui\css\images\rotten.png</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\splash.jpg">
<Link>Resources\dashboard-ui\css\images\splash.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\splash720.jpg">
<Link>Resources\dashboard-ui\css\images\splash720.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\stars.png">
<Link>Resources\dashboard-ui\css\images\stars.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon.png">
<Link>Resources\dashboard-ui\css\images\touchicon.png</Link> <Link>Resources\dashboard-ui\css\images\touchicon.png</Link>
</BundleResource> </BundleResource>
@ -4023,9 +3957,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\list\person.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\list\person.png">
<Link>Resources\dashboard-ui\css\images\items\list\person.png</Link> <Link>Resources\dashboard-ui\css\images\items\list\person.png</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\searchhintsv2\tv.png">
<Link>Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\chapterflyout.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\chapterflyout.png">
<Link>Resources\dashboard-ui\css\images\media\chapterflyout.png</Link> <Link>Resources\dashboard-ui\css\images\media\chapterflyout.png</Link>
</BundleResource> </BundleResource>
@ -4035,21 +3966,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\play.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\play.png">
<Link>Resources\dashboard-ui\css\images\media\play.png</Link> <Link>Resources\dashboard-ui\css\images\media\play.png</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\cancelled.png">
<Link>Resources\dashboard-ui\css\images\notifications\cancelled.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\done.png">
<Link>Resources\dashboard-ui\css\images\notifications\done.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\download.png">
<Link>Resources\dashboard-ui\css\images\notifications\download.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\error.png">
<Link>Resources\dashboard-ui\css\images\notifications\error.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\info.png">
<Link>Resources\dashboard-ui\css\images\notifications\info.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\nonsupporterbadge.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\nonsupporterbadge.png">
<Link>Resources\dashboard-ui\css\images\supporter\nonsupporterbadge.png</Link> <Link>Resources\dashboard-ui\css\images\supporter\nonsupporterbadge.png</Link>
</BundleResource> </BundleResource>