Merge branch 'maintenance' into devel

# Conflicts: # src/octoprint/static/js/lib/less.min.js
2016-10-06 09:22:36 +02:00 · 2016-10-06 09:22:36 +02:00 · c850646539
commit c850646539
parent e1814e9c7e 6c21ee32a8
2 changed files with 10 additions and 11 deletions
--- a/src/octoprint/static/js/app/helpers.js
+++ b/src/octoprint/static/js/app/helpers.js
@ -228,7 +228,7 @@ function ItemListHelper(listType, supportedSorting, supportedFilters, defaultSor
            return;

        var filters = self.currentFilters();
-        filters.pop(filter);
+        filters = _.without(filters, filter);
        self.currentFilters(filters);
        self._saveCurrentFiltersToLocalStorage();

--- a/src/octoprint/static/js/lib/less.min.js
+++ b/src/octoprint/static/js/lib/less.min.js