mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/livetvrecordings.js
View file

@ -70,7 +70,8 @@
showParentTitle: true,
centerText: true,
coverImage: true,
lazy: true
lazy: true,
overlayPlayButton: true
});
@ -84,7 +85,8 @@
ApiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
IsInProgress: true
IsInProgress: true,
Fields: 'CanDelete'
}).then(function (result) {
@ -96,7 +98,8 @@
userId: Dashboard.getCurrentUserId(),
limit: 12,
IsInProgress: false
IsInProgress: false,
Fields: 'CanDelete'
}).then(function (result) {