From a39645a2972a9546e86b467681fa1a571caa070a Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 17 Jul 2017 15:58:53 +0200 Subject: [PATCH 1/2] fix(images): fix the system/df call to display unused images (#1037) --- app/rest/docker/system.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/rest/docker/system.js b/app/rest/docker/system.js index 242f1f120..c0285070a 100644 --- a/app/rest/docker/system.js +++ b/app/rest/docker/system.js @@ -1,7 +1,7 @@ angular.module('portainer.rest') .factory('System', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SystemFactory($resource, DOCKER_ENDPOINT, EndpointProvider) { 'use strict'; - return $resource(DOCKER_ENDPOINT + '/:endpointId/:action', { + return $resource(DOCKER_ENDPOINT + '/:endpointId/:action/:subAction', { name: '@name', endpointId: EndpointProvider.endpointID }, @@ -13,6 +13,6 @@ angular.module('portainer.rest') isArray: true, transformResponse: jsonObjectsToArrayHandler }, auth: { method: 'POST', params: { action: 'auth' } }, - dataUsage: { method: 'GET', params: { action: 'system/df' } } + dataUsage: { method: 'GET', params: { action: 'system', subAction: 'df' } } }); }]); From f2347b2f7785116d908986040a81f1b6b08d7751 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 17 Jul 2017 15:59:43 +0200 Subject: [PATCH 2/2] chore(version): bump version number --- api/portainer.go | 2 +- bower.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/portainer.go b/api/portainer.go index 756653787..6ed70e7ee 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -305,7 +305,7 @@ type ( const ( // APIVersion is the version number of the Portainer API. - APIVersion = "1.13.5" + APIVersion = "1.13.6" // DBVersion is the version number of the Portainer database. DBVersion = 2 // DefaultTemplatesURL represents the default URL for the templates definitions. diff --git a/bower.json b/bower.json index 52fcd4eda..fc93a251e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "portainer", - "version": "1.13.5", + "version": "1.13.6", "homepage": "https://github.com/portainer/portainer", "authors": [ "Anthony Lapenna " diff --git a/package.json b/package.json index 70665e948..dde247094 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.13.5", + "version": "1.13.6", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git"