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

Merge branch 'release/1.15.5'

pull/1507/head 1.15.5
Anthony Lapenna 2017-12-11 16:03:58 +01:00
parent 39236ae84e fbd9139928
commit 45e7938c5c
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/portainer.go
View File

@ -390,7 +390,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API. // APIVersion is the version number of the Portainer API.
APIVersion = "1.15.4" APIVersion = "1.15.5"
// DBVersion is the version number of the Portainer database. // DBVersion is the version number of the Portainer database.
DBVersion = 7 DBVersion = 7
// DefaultTemplatesURL represents the default URL for the templates definitions. // DefaultTemplatesURL represents the default URL for the templates definitions.

4
api/swagger.yaml
View File

@ -56,7 +56,7 @@ info:
**NOTE**: You can find more information on how to query the Docker API in the [Docker official documentation](https://docs.docker.com/engine/api/v1.30/) as well as in [this Portainer example](https://gist.github.com/deviantony/77026d402366b4b43fa5918d41bc42f8). **NOTE**: You can find more information on how to query the Docker API in the [Docker official documentation](https://docs.docker.com/engine/api/v1.30/) as well as in [this Portainer example](https://gist.github.com/deviantony/77026d402366b4b43fa5918d41bc42f8).
version: "1.15.4" version: "1.15.5"
title: "Portainer API" title: "Portainer API"
contact: contact:
email: "info@portainer.io" email: "info@portainer.io"
@ -1869,7 +1869,7 @@ definitions:
description: "Is analytics enabled" description: "Is analytics enabled"
Version: Version:
type: "string" type: "string"
example: "1.15.4" example: "1.15.5"
description: "Portainer API version" description: "Portainer API version"
PublicSettingsInspectResponse: PublicSettingsInspectResponse:
type: "object" type: "object"

2
app/directives/ui/datatables/networks-datatable/networksDatatable.html
View File

@ -17,7 +17,7 @@
<i class="fa fa-trash space-right" aria-hidden="true"></i>Remove <i class="fa fa-trash space-right" aria-hidden="true"></i>Remove
</button> </button>
<button type="button" class="btn btn-sm btn-primary" ui-sref="actions.create.network"> <button type="button" class="btn btn-sm btn-primary" ui-sref="actions.create.network">
<i class="fa fa-plus space-right" aria-hidden="true"></i>Add volume <i class="fa fa-plus space-right" aria-hidden="true"></i>Add network
</button> </button>
</div> </div>
<div class="searchBar" ng-if="$ctrl.state.displayTextFilter"> <div class="searchBar" ng-if="$ctrl.state.displayTextFilter">

4
assets/css/app.css
View File

@ -124,6 +124,10 @@ a[ng-click]{
font-size: 90% !important; font-size: 90% !important;
} }
.widget .widget-body table thead th {
font-weight: normal;
}
.template-widget { .template-widget {
height: 100%; height: 100%;
} }

2
distribution/portainer.spec
View File

@ -1,5 +1,5 @@
Name: portainer Name: portainer
Version: 1.15.4 Version: 1.15.5
Release: 0 Release: 0
License: Zlib License: Zlib
Summary: A lightweight docker management UI Summary: A lightweight docker management UI

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.15.4", "version": "1.15.5",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"