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

Merge tag '1.2.0' into develop 

Release 1.2.0
pull/43/head
Anthony Lapenna 2016-07-06 16:41:33 +12:00
parent 59820e737e 56ef453203
commit 4ba6286c97
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.js
View File

@ -144,4 +144,4 @@ angular.module('uifordocker', [
.constant('DOCKER_ENDPOINT', 'dockerapi') .constant('DOCKER_ENDPOINT', 'dockerapi')
.constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243
.constant('CONFIG_ENDPOINT', '/config') .constant('CONFIG_ENDPOINT', '/config')
.constant('UI_VERSION', 'v1.1.0'); .constant('UI_VERSION', 'v1.2.0');

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "uifordocker", "name": "uifordocker",
"version": "1.1.0", "version": "1.2.0",
"homepage": "https://github.com/kevana/ui-for-docker", "homepage": "https://github.com/kevana/ui-for-docker",
"authors": [ "authors": [
"Michael Crosby <crosbymichael@gmail.com>", "Michael Crosby <crosbymichael@gmail.com>",

2
dockerui.go
View File

@ -173,7 +173,7 @@ func csrfWrapper(h http.Handler) http.Handler {
} }
func main() { func main() {
kingpin.Version("1.1.0") kingpin.Version("1.2.0")
kingpin.Parse() kingpin.Parse()
configuration := Config{ configuration := Config{

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Michael Crosby & Kevan Ahlquist", "author": "Michael Crosby & Kevan Ahlquist",
"name": "uifordocker", "name": "uifordocker",
"homepage": "https://github.com/kevana/ui-for-docker", "homepage": "https://github.com/kevana/ui-for-docker",
"version": "1.1.0", "version": "1.2.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:kevana/ui-for-docker.git" "url": "git@github.com:kevana/ui-for-docker.git"