From dba3f52d2e50fc7f1ca11a457172c52d0054217e Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 4 Jan 2018 23:25:09 -0800 Subject: [PATCH] GUACAMOLE-394: Timestamps within JSON from the REST API are in milliseconds, not seconds. --- guacamole/src/main/webapp/app/rest/types/Connection.js | 2 +- guacamole/src/main/webapp/app/rest/types/User.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/rest/types/Connection.js b/guacamole/src/main/webapp/app/rest/types/Connection.js index 52da6b7e2..76ece9d58 100644 --- a/guacamole/src/main/webapp/app/rest/types/Connection.js +++ b/guacamole/src/main/webapp/app/rest/types/Connection.js @@ -105,7 +105,7 @@ angular.module('rest').factory('Connection', [function defineConnection() { this.sharingProfiles = template.sharingProfiles; /** - * The time that this connection was last used, in seconds since + * The time that this connection was last used, in milliseconds since * 1970-01-01 00:00:00 UTC. If this information is unknown or * unavailable, this will be null. * diff --git a/guacamole/src/main/webapp/app/rest/types/User.js b/guacamole/src/main/webapp/app/rest/types/User.js index d0a96cc3e..f796147d6 100644 --- a/guacamole/src/main/webapp/app/rest/types/User.js +++ b/guacamole/src/main/webapp/app/rest/types/User.js @@ -54,7 +54,7 @@ angular.module('rest').factory('User', [function defineUser() { this.password = template.password; /** - * The time that this user was last logged in, in seconds since + * The time that this user was last logged in, in milliseconds since * 1970-01-01 00:00:00 UTC. If this information is unknown or * unavailable, this will be null. *