mirror of
https://github.com/portainer/portainer.git
synced 2025-07-23 15:29:42 +02:00
Merge remote-tracking branch 'origin/master' into logs_tail
This commit is contained in:
commit
87131f4ae3
14 changed files with 403 additions and 173 deletions
|
@ -30,7 +30,7 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
|
|||
// Replace carriage returns twith newlines to clean up output
|
||||
$scope.stdout = data.replace(/[\r]/g, '\n');
|
||||
});
|
||||
ContainerLogs.get($routeParams.id, {stdout: 0, stderr: 1}, function(data, status, headers, config) {
|
||||
ContainerLogs.get($routeParams.id, {stdout: 0, stderr: 1, timestamps: $scope.showTimestamps}, function(data, status, headers, config) {
|
||||
$scope.stderr = data.replace(/[\r]/g, '\n');
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue