Comparing version 0.6.2 to 0.6.3
@@ -16,7 +16,7 @@ { | ||
"dependencies": { | ||
"angular": "1.3.x", | ||
"angular-animate": "1.3.x", | ||
"angular-aria": "1.3.x", | ||
"angular": "1.4.x", | ||
"angular-animate": "1.4.x", | ||
"angular-aria": "1.4.x", | ||
"hammerjs": "2.0.x", | ||
"angular-resource": "1.3.x", | ||
"angular-resource": "1.4.x", | ||
"angular-ui-router": "0.2.x", | ||
@@ -30,9 +30,9 @@ "d3": "3.5.x", | ||
"angular-loading-bar": "0.6.x", | ||
"angular-moment": "0.8.x", | ||
"angular-moment": "0.9.x", | ||
"angular-translate": "2.5.x", | ||
"angular-translate-storage-local": "2.5.x", | ||
"angular-translate-loader-static-files": "~2.5.2", | ||
"angular-translate-storage-cookie": "~2.5.2", | ||
"angular-cookies": "1.3.8" | ||
"angular-translate-loader-static-files": "2.5.x", | ||
"angular-translate-storage-cookie": "2.5.x", | ||
"angular-cookies": "1.4.x" | ||
} | ||
} |
@@ -44,3 +44,3 @@ 'use strict'; | ||
var imagemin = plugins.imagemin; | ||
var usemin = plugins.usemin; | ||
var useref = plugins.useref; | ||
var rev = plugins.rev; | ||
@@ -58,3 +58,5 @@ | ||
gulp.task('publish:html', function() { | ||
var assets = useref.assets(); | ||
return gulp.src('dist/**/*.html') | ||
/* | ||
.pipe(usemin({ | ||
@@ -66,2 +68,7 @@ css: [csso(), rev()], | ||
})) | ||
*/ | ||
.pipe(assets) | ||
.pipe(gif('*.js', uglify({ preserveComments: 'some' }), rev())) | ||
.pipe(gif('*.css', csso(), rev())) | ||
.pipe(assets.restore()) | ||
.pipe(gulp.dest('tmp/')); | ||
@@ -68,0 +75,0 @@ }); |
0.6.3 / 2015-01-19 | ||
================== | ||
* upgrade angular@1.4 | ||
* upgrade node-modules | ||
* list processes running inside container | ||
0.6.2 / 2015-01-13 | ||
@@ -3,0 +10,0 @@ ================== |
{ | ||
"name": "bluewhale", | ||
"version": "0.6.2", | ||
"version": "0.6.3", | ||
"description": "Dockerboard Web Client", | ||
@@ -26,3 +26,3 @@ "main": "dist/index.html", | ||
"glob": "^4.3.2", | ||
"gulp": "*", | ||
"gulp": "^3.8.10", | ||
"gulp-autoprefixer": "^2.0.0", | ||
@@ -38,9 +38,9 @@ "gulp-csso": "^0.2.9", | ||
"gulp-load-plugins": "^0.8.0", | ||
"gulp-ng-annotate": "^0.4.3", | ||
"gulp-ng-annotate": "^0.5.0", | ||
"gulp-ng-html2js": "^0.1.8", | ||
"gulp-plumber": "^0.6.6", | ||
"gulp-rev": "^2.0.1", | ||
"gulp-rev": "^3.0.0", | ||
"gulp-sass": "ajoslin/gulp-sass#master", | ||
"gulp-uglify": "^1.0.2", | ||
"gulp-usemin": "^0.3.8", | ||
"gulp-useref": "^1.1.1", | ||
"gulp-watch": "^3.0.0", | ||
@@ -47,0 +47,0 @@ "jshint-summary": "^0.4.0", |
@@ -6,3 +6,4 @@ | ||
[![NPM version][npm-image]][npm-url] | ||
[![NPM version][npm-image]][npm-url] | ||
[![build status][travis-image]][travis-url] | ||
@@ -80,1 +81,3 @@ [![badge](http://dockeri.co/image/dockerboard/bluewhale)](https://registry.hub.docker.com/u/dockerboard/bluewhale/) | ||
[npm-url]: https://npmjs.org/package/bluewhale | ||
[travis-image]: https://img.shields.io/travis/dockerboard/bluewhale/master.svg?style=flat-square | ||
[travis-url]: https://travis-ci.org/dockerboard/bluewhale |
@@ -19,6 +19,6 @@ (function (angular) { | ||
$translateProvider.useStaticFilesLoader({ | ||
prefix: 'data/locale-', | ||
prefix: 'l10n/', | ||
suffix: '.json' | ||
}); | ||
$translateProvider.preferredLanguage('en'); | ||
$translateProvider.preferredLanguage('en_US'); | ||
$translateProvider.useLocalStorage(); | ||
@@ -25,0 +25,0 @@ } |
@@ -10,2 +10,3 @@ (function () { | ||
.controller('ContainerLogsCtrl', ContainerLogsController) | ||
.controller('ContainerTopCtrl', ContainerTopController) | ||
.config(['$stateProvider', | ||
@@ -25,2 +26,6 @@ function ($stateProvider) { | ||
templateUrl: '/js/modules/containers/views/container.logs.tpl.html' | ||
}) | ||
.state('containerTop', { | ||
url: '/containers/{Id}/top', | ||
templateUrl: '/js/modules/containers/views/container.top.tpl.html' | ||
}); | ||
@@ -339,2 +344,35 @@ } | ||
ContainerTopController.$inject = ['$scope', '$stateParams', 'ContainerActions']; | ||
function ContainerTopController($scope, $stateParams, ContainerActions) { | ||
$scope.containerShortId = $stateParams.Id; | ||
$scope.action = 'top'; | ||
$scope.queryParams = { | ||
ps_args: '' | ||
}; | ||
$scope.fetch = function () { | ||
ContainerActions.get( | ||
{ | ||
Id: $scope.containerShortId, | ||
action: $scope.action, | ||
ps_args: $scope.queryParams.ps_args | ||
}, | ||
function (data) { | ||
$scope.Titles = data.Titles; | ||
$scope.Processes = data.Processes; | ||
}, | ||
function (data) { | ||
} | ||
); | ||
}; | ||
$scope.fetch(); | ||
$scope.search = function () { | ||
$scope.fetch(); | ||
}; | ||
} | ||
})(); |
@@ -328,3 +328,2 @@ (function () { | ||
function (data) { | ||
console.dir(data); | ||
$mdDialog.hide(); | ||
@@ -331,0 +330,0 @@ }, |
@@ -42,5 +42,4 @@ (function () { | ||
}); | ||
console.dir(res); | ||
return res; | ||
}]); | ||
})(); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Minified code
QualityThis package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Minified code
QualityThis package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.
Found 1 instance in 1 package
6370766
112
3909
82