Merge branch 'release/1.11.3'

api/cli/defaults_windows.go

@@ -2,11 +2,11 @@ package cli
 
 const (
 	defaultBindAddress     = ":9000"
-	defaultDataDirectory   = "C:\\ProgramData\\Portainer"
+	defaultDataDirectory   = "C:\\data"
 	defaultAssetsDirectory = "."
 	defaultTemplatesURL    = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
 	defaultTLSVerify       = "false"
-	defaultTLSCACertPath   = "C:\\ProgramData\\Portainer\\certs\\ca.pem"
-	defaultTLSCertPath     = "C:\\ProgramData\\Portainer\\certs\\cert.pem"
-	defaultTLSKeyPath      = "C:\\ProgramData\\Portainer\\certs\\key.pem"
+	defaultTLSCACertPath   = "C:\\certs\\ca.pem"
+	defaultTLSCertPath     = "C:\\certs\\cert.pem"
+	defaultTLSKeyPath      = "C:\\certs\\key.pem"
 )

api/portainer.go

@@ -119,7 +119,7 @@ type (
 
 const (
 	// APIVersion is the version number of portainer API.
-	APIVersion = "1.11.2"
+	APIVersion = "1.11.3"
 )
 
 const (

app/app.js

@@ -568,4 +568,4 @@ angular.module('portainer', [
   .constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
   .constant('TEMPLATES_ENDPOINT', 'api/templates')
   .constant('PAGINATION_MAX_ITEMS', 10)
-  .constant('UI_VERSION', 'v1.11.2');
+  .constant('UI_VERSION', 'v1.11.3');

bower.json

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

package.json

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