${MessageSupporterPluginRequiresMembership}
- +diff --git a/dashboard-ui/apiclient/sync/mediasync.js b/dashboard-ui/apiclient/sync/mediasync.js index c5eec700c..ddde0970b 100644 --- a/dashboard-ui/apiclient/sync/mediasync.js +++ b/dashboard-ui/apiclient/sync/mediasync.js @@ -498,18 +498,17 @@ require(['localassetmanager'], function () { - LocalAssetManager.getLocalItem(itemId, serverId).done(function (localItem) { + LocalAssetManager.getUserIdsWithAccess(itemId, serverId).done(function (savedUserIdsWithAccess) { var userIdsWithAccess = syncDataResult.ItemUserAccess[itemId]; - if (userIdsWithAccess.join(',') == localItem.UserIdsWithAccess.join(',')) { + if (userIdsWithAccess.join(',') == savedUserIdsWithAccess.join(',')) { // Hasn't changed, nothing to do deferred.resolve(); } else { - localItem.UserIdsWithAccess = userIdsWithAccess; - LocalAssetManager.addOrUpdateLocalItem(localItem).done(function () { + LocalAssetManager.saveUserIdsWithAccess(itemId, serverId, userIdsWithAccess).done(function () { deferred.resolve(); }).fail(getOnFail(deferred)); } diff --git a/dashboard-ui/apiclient/sync/serversync.js b/dashboard-ui/apiclient/sync/serversync.js index 64aa74566..4fbb3f4eb 100644 --- a/dashboard-ui/apiclient/sync/serversync.js +++ b/dashboard-ui/apiclient/sync/serversync.js @@ -79,6 +79,11 @@ function syncOfflineUsers(server, options, deferred) { + if (options.syncOfflineUsers === false) { + syncMedia(server, options, deferred); + return; + } + require(['offlineusersync'], function () { var apiClient = connectionManager.getApiClient(server.Id); diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index f49935188..5d7b926af 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -27,14 +27,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-behaviors", + "homepage": "https://github.com/polymerelements/iron-behaviors", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "663ad706b43989f4961d945b8116cf4db346532f" }, - "_source": "git://github.com/PolymerElements/iron-behaviors.git", + "_source": "git://github.com/polymerelements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-behaviors" + "_originalSource": "polymerelements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790b..8119ebcf4 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-dropdown-menu/.bower.json b/dashboard-ui/bower_components/paper-dropdown-menu/.bower.json index 9b182465b..5b6dbf90e 100644 --- a/dashboard-ui/bower_components/paper-dropdown-menu/.bower.json +++ b/dashboard-ui/bower_components/paper-dropdown-menu/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-dropdown-menu", - "version": "1.0.3", + "version": "1.0.4", "description": "An element that works similarly to a native browser select", "authors": [ "The Polymer Authors" @@ -40,11 +40,11 @@ "web-component-tester": "*", "paper-tabs": "polymerelements/paper-tabs#^1.0.0" }, - "_release": "1.0.3", + "_release": "1.0.4", "_resolution": { "type": "version", - "tag": "v1.0.3", - "commit": "346aba1cc0231f52d32fe4dce1792a16df3a990a" + "tag": "v1.0.4", + "commit": "b278c9ea1b3642c77bd4597a28b39a61996a5a9e" }, "_source": "git://github.com/PolymerElements/paper-dropdown-menu.git", "_target": "~1.0.1", diff --git a/dashboard-ui/bower_components/paper-dropdown-menu/bower.json b/dashboard-ui/bower_components/paper-dropdown-menu/bower.json index 8fe9297b8..fa482aa90 100644 --- a/dashboard-ui/bower_components/paper-dropdown-menu/bower.json +++ b/dashboard-ui/bower_components/paper-dropdown-menu/bower.json @@ -1,6 +1,6 @@ { "name": "paper-dropdown-menu", - "version": "1.0.3", + "version": "1.0.4", "description": "An element that works similarly to a native browser select", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-dropdown-menu/paper-dropdown-menu.html b/dashboard-ui/bower_components/paper-dropdown-menu/paper-dropdown-menu.html index 0494003e7..d807a08ef 100644 --- a/dashboard-ui/bower_components/paper-dropdown-menu/paper-dropdown-menu.html +++ b/dashboard-ui/bower_components/paper-dropdown-menu/paper-dropdown-menu.html @@ -117,6 +117,7 @@ respectively. } paper-menu-button { + display: block; @apply(--paper-dropdown-menu-button); } @@ -199,6 +200,8 @@ respectively. * The last selected item. An item is selected if the dropdown menu has * a child with class `dropdown-content`, and that child triggers an * `iron-select` event with the selected `item` in the `detail`. + * + * @type {?Object} */ selectedItem: { type: Object, @@ -364,4 +367,3 @@ respectively. }); })(); - diff --git a/dashboard-ui/bower_components/paper-progress/.bower.json b/dashboard-ui/bower_components/paper-progress/.bower.json index 774d985a4..9746e164f 100644 --- a/dashboard-ui/bower_components/paper-progress/.bower.json +++ b/dashboard-ui/bower_components/paper-progress/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-progress", - "version": "1.0.6", + "version": "1.0.7", "license": "http://polymer.github.io/LICENSE.txt", "description": "A material design progress bar", "authors": "The Polymer Authors", @@ -19,7 +19,8 @@ "dependencies": { "polymer": "Polymer/polymer#^1.0.0", "iron-range-behavior": "PolymerElements/iron-range-behavior#^1.0.0", - "paper-styles": "PolymerElements/paper-styles#^1.0.0" + "paper-styles": "PolymerElements/paper-styles#^1.0.0", + "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", @@ -29,11 +30,11 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "homepage": "https://github.com/PolymerElements/paper-progress", - "_release": "1.0.6", + "_release": "1.0.7", "_resolution": { "type": "version", - "tag": "v1.0.6", - "commit": "520d84592d98cac975bfcedfcc5765e51d2c2871" + "tag": "v1.0.7", + "commit": "39a860b8306b0a47e9216ac5b6063b2f88b7772f" }, "_source": "git://github.com/PolymerElements/paper-progress.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/paper-progress/bower.json b/dashboard-ui/bower_components/paper-progress/bower.json index 1bcb4e3cd..9ac764709 100644 --- a/dashboard-ui/bower_components/paper-progress/bower.json +++ b/dashboard-ui/bower_components/paper-progress/bower.json @@ -1,6 +1,6 @@ { "name": "paper-progress", - "version": "1.0.5", + "version": "1.0.7", "license": "http://polymer.github.io/LICENSE.txt", "description": "A material design progress bar", "authors": "The Polymer Authors", @@ -19,7 +19,8 @@ "dependencies": { "polymer": "Polymer/polymer#^1.0.0", "iron-range-behavior": "PolymerElements/iron-range-behavior#^1.0.0", - "paper-styles": "PolymerElements/paper-styles#^1.0.0" + "paper-styles": "PolymerElements/paper-styles#^1.0.0", + "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", diff --git a/dashboard-ui/bower_components/paper-progress/paper-progress.html b/dashboard-ui/bower_components/paper-progress/paper-progress.html index 504c8b35b..a2eedbd31 100644 --- a/dashboard-ui/bower_components/paper-progress/paper-progress.html +++ b/dashboard-ui/bower_components/paper-progress/paper-progress.html @@ -9,9 +9,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN --> - - + +