diff --git a/api/main.go b/api/main.go index ef09c09da..0a708b01f 100644 --- a/api/main.go +++ b/api/main.go @@ -6,7 +6,7 @@ import ( // main is the entry point of the program func main() { - kingpin.Version("1.5.0") + kingpin.Version("1.6.0") var ( endpoint = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String() addr = kingpin.Flag("bind", "Address and port to serve UI For Docker").Default(":9000").Short('p').String() diff --git a/app/app.js b/app/app.js index 0d74285e6..77934004a 100644 --- a/app/app.js +++ b/app/app.js @@ -154,4 +154,4 @@ angular.module('uifordocker', [ .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('CONFIG_ENDPOINT', 'settings') - .constant('UI_VERSION', 'v1.5.0'); + .constant('UI_VERSION', 'v1.6.0'); diff --git a/app/components/images/images.html b/app/components/images/images.html index e810f21bf..fc840144b 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -69,7 +69,7 @@ - +
Id diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js index 8e502b6ec..50f43567e 100644 --- a/app/components/images/imagesController.js +++ b/app/components/images/imagesController.js @@ -4,7 +4,6 @@ function ($scope, $state, Config, Image, Messages) { $scope.state = {}; $scope.sortType = 'RepoTags'; $scope.sortReverse = true; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.config = { @@ -17,17 +16,6 @@ function ($scope, $state, Config, Image, Messages) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredImages, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredImages.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++; diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index 56adc1956..b7e853f0a 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -85,7 +85,7 @@ - +
Name diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js index cfd4783a2..bf1855fe7 100644 --- a/app/components/networks/networksController.js +++ b/app/components/networks/networksController.js @@ -2,7 +2,6 @@ angular.module('networks', []) .controller('NetworksController', ['$scope', '$state', 'Network', 'Messages', 'errorMsgFilter', function ($scope, $state, Network, Messages, errorMsgFilter) { $scope.state = {}; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.state.advancedSettings = false; $scope.sortType = 'Scope'; @@ -25,17 +24,6 @@ function ($scope, $state, Network, Messages, errorMsgFilter) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredNetworks, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredNetworks.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++; diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index d36cc2718..6c7cc2bc9 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -61,7 +61,7 @@ - +
Name diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js index aceaa5fa9..8006af5bc 100644 --- a/app/components/volumes/volumesController.js +++ b/app/components/volumes/volumesController.js @@ -2,7 +2,6 @@ angular.module('volumes', []) .controller('VolumesController', ['$scope', '$state', 'Volume', 'Messages', 'errorMsgFilter', function ($scope, $state, Volume, Messages, errorMsgFilter) { $scope.state = {}; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.sortType = 'Driver'; $scope.sortReverse = true; @@ -16,17 +15,6 @@ function ($scope, $state, Volume, Messages, errorMsgFilter) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredVolumes, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredVolumes.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++; diff --git a/bower.json b/bower.json index eda8a5475..8220a2dde 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "uifordocker", - "version": "1.5.0", + "version": "1.6.0", "homepage": "https://github.com/kevana/ui-for-docker", "authors": [ "Michael Crosby ", diff --git a/package.json b/package.json index 829adeb49..025680d1e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Michael Crosby & Kevan Ahlquist", "name": "uifordocker", "homepage": "https://github.com/kevana/ui-for-docker", - "version": "1.5.0", + "version": "1.6.0", "repository": { "type": "git", "url": "git@github.com:kevana/ui-for-docker.git"