github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/1.13.6'

pull/1045/head 1.13.6
Anthony Lapenna 2017-07-17 16:00:40 +02:00
parent a438357b45 f2347b2f77
commit 2e2aba1bbb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/portainer.go
View File

@ -305,7 +305,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API. // 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 is the version number of the Portainer database.
DBVersion = 2 DBVersion = 2
// DefaultTemplatesURL represents the default URL for the templates definitions. // DefaultTemplatesURL represents the default URL for the templates definitions.

4
app/rest/docker/system.js
View File

@ -1,7 +1,7 @@
angular.module('portainer.rest') angular.module('portainer.rest')
.factory('System', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SystemFactory($resource, DOCKER_ENDPOINT, EndpointProvider) { .factory('System', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SystemFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
'use strict'; 'use strict';
return $resource(DOCKER_ENDPOINT + '/:endpointId/:action', { return $resource(DOCKER_ENDPOINT + '/:endpointId/:action/:subAction', {
name: '@name', name: '@name',
endpointId: EndpointProvider.endpointID endpointId: EndpointProvider.endpointID
}, },
@ -13,6 +13,6 @@ angular.module('portainer.rest')
isArray: true, transformResponse: jsonObjectsToArrayHandler isArray: true, transformResponse: jsonObjectsToArrayHandler
}, },
auth: { method: 'POST', params: { action: 'auth' } }, auth: { method: 'POST', params: { action: 'auth' } },
dataUsage: { method: 'GET', params: { action: 'system/df' } } dataUsage: { method: 'GET', params: { action: 'system', subAction: 'df' } }
}); });
}]); }]);

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "portainer", "name": "portainer",
"version": "1.13.5", "version": "1.13.6",
"homepage": "https://github.com/portainer/portainer", "homepage": "https://github.com/portainer/portainer",
"authors": [ "authors": [
"Anthony Lapenna <anthony.lapenna at gmail dot com>" "Anthony Lapenna <anthony.lapenna at gmail dot com>"

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Portainer.io", "author": "Portainer.io",
"name": "portainer", "name": "portainer",
"homepage": "http://portainer.io", "homepage": "http://portainer.io",
"version": "1.13.5", "version": "1.13.6",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"