diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html index 1ce19bf817..733d98aa9d 100644 --- a/dashboard-ui/autoorganizelog.html +++ b/dashboard-ui/autoorganizelog.html @@ -19,8 +19,8 @@
diff --git a/dashboard-ui/bower_components/eventie/.bower.json b/dashboard-ui/bower_components/eventie/.bower.json index 6b5b662fdc..917d217ea8 100644 --- a/dashboard-ui/bower_components/eventie/.bower.json +++ b/dashboard-ui/bower_components/eventie/.bower.json @@ -30,6 +30,6 @@ "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" }, "_source": "git://github.com/desandro/eventie.git", - "_target": "~1.0.3", + "_target": "^1", "_originalSource": "eventie" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index ae0aab2a97..8c65ba5e1a 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -38,7 +38,7 @@ "tag": "v1.0.7", "commit": "0b2f484ac3b1b03400da2d38b0f543f3688150a4" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/cordova/iap.js b/dashboard-ui/cordova/iap.js index 54933a92fd..63985c0c64 100644 --- a/dashboard-ui/cordova/iap.js +++ b/dashboard-ui/cordova/iap.js @@ -14,6 +14,10 @@ function updateProductInfo(product) { + if (product.id == 'appunlock') { + product.owned = false; + } + updatedProducts = updatedProducts.filter(function (r) { return r.id != product.id; }); diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index 37be2f2f4a..8539ac85b0 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -1535,5 +1535,6 @@ "HeaderAdmin": "Admin", "ButtonSignOut": "Sign out", "HeaderCameraUpload": "Camera Upload", - "SelectCameraUploadServers": "Upload camera photos to the following servers:" + "SelectCameraUploadServers": "Upload camera photos to the following servers:", + "ButtonClear": "Clear" } diff --git a/dashboard-ui/themes/halloween/theme.js b/dashboard-ui/themes/halloween/theme.js index 6b9d891f98..f20b5e954d 100644 --- a/dashboard-ui/themes/halloween/theme.js +++ b/dashboard-ui/themes/halloween/theme.js @@ -7,14 +7,17 @@ function onPageShow() { var page = this; - if (!$.browser.mobile && !page.classList.contains('itemDetailPage')) { - Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg'); - } + if (!$.browser.mobile) { - if (lastSound == 0) { - playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/monsterparade.mp3', .2); - } else if ((new Date().getTime() - lastSound) > 30000) { - playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/howl.wav'); + if (!page.classList.contains('itemDetailPage')) { + Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg'); + } + + if (lastSound == 0) { + playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/monsterparade.mp3', .1); + } else if ((new Date().getTime() - lastSound) > 30000) { + playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/howl.wav'); + } } } diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html index 136518ad0e..202d59803d 100644 --- a/dashboard-ui/thirdparty/emby-icons.html +++ b/dashboard-ui/thirdparty/emby-icons.html @@ -37,6 +37,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for + diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js index f4a19f29c7..f4d82fbd1a 100644 --- a/dashboard-ui/thirdparty/jquery.unveil-custom.js +++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js @@ -26,8 +26,8 @@ */ var $w = $(window); - var thresholdX = Math.max(screen.availWidth * .5); - var thresholdY = Math.max(screen.availHeight * .5); + var thresholdX = Math.max(screen.availWidth); + var thresholdY = Math.max(screen.availHeight); function visibleInViewport(elem, partial, hidden, direction) { diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index 6011796fc0..d3717efb20 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -19491,6 +19491,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] { +