milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js
This commit is contained in:
Tim Hobbs 2014-03-05 04:27:13 -08:00
commit f9541e56fd
228 changed files with 1459 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/itemdetailpage.js
View file

@ -35,7 +35,7 @@
$('#editButtonContainer', page).hide();
}
if (MediaPlayer.canPlay(item, user) && item.LocationType !== "Offline" && item.LocationType !== "Virtual") {
if (MediaPlayer.canPlay(item, user)) {
var url = MediaPlayer.getPlayUrl(item);