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

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

@ -4,7 +4,6 @@
page.querySelector('#txtSyncPath').value = AppSettings.syncPath();
page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi();
page.querySelector('#chkSyncLosslessAudio').checked = AppSettings.syncLosslessAudio();
var uploadServers = AppSettings.cameraUploadServers();
@ -24,7 +23,6 @@
AppSettings.syncPath(page.querySelector('#txtSyncPath').value);
AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked);
AppSettings.syncLosslessAudio(page.querySelector('#chkSyncLosslessAudio').checked);
AppSettings.cameraUploadServers($(".chkUploadServer", page).get().filter(function (i) {