Merge branch 'release/1.15.5'

api/portainer.go

@@ -390,7 +390,7 @@ type (
 
 const (
 	// 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 = 7
 	// DefaultTemplatesURL represents the default URL for the templates definitions.

api/swagger.yaml

@@ -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).
 
-  version: "1.15.4"
+  version: "1.15.5"
   title: "Portainer API"
   contact:
     email: "info@portainer.io"
@@ -1869,7 +1869,7 @@ definitions:
         description: "Is analytics enabled"
       Version:
         type: "string"
-        example: "1.15.4"
+        example: "1.15.5"
         description: "Portainer API version"
   PublicSettingsInspectResponse:
     type: "object"

app/directives/ui/datatables/networks-datatable/networksDatatable.html

@@ -17,7 +17,7 @@
           <i class="fa fa-trash space-right" aria-hidden="true"></i>Remove
         </button>
         <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>
       </div>
       <div class="searchBar" ng-if="$ctrl.state.displayTextFilter">

assets/css/app.css

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

distribution/portainer.spec

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

package.json

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