From f2a903d0542d140fd6fe788f87ec10e673827f54 Mon Sep 17 00:00:00 2001 From: McMatts Date: Thu, 26 Apr 2018 13:44:29 +0100 Subject: [PATCH] Ensure activity view works on UTC date formats --- gui/app/helpers/formatted-date.js | 10 ++++++---- gui/app/utils/date.js | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gui/app/helpers/formatted-date.js b/gui/app/helpers/formatted-date.js index a92140d6..b008434c 100644 --- a/gui/app/helpers/formatted-date.js +++ b/gui/app/helpers/formatted-date.js @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com @@ -15,7 +15,9 @@ export function formattedDate(params) { let format = params[1]; if (is.undefined(format)) format = 'Do MMMM YYYY, HH:mm'; - return moment(params[0]).format(format); + return moment(params[0]).utc().format(format); + // return moment(params[0]).format(format); + // return moment(params[0]).local().format(format); } -export default helper(formattedDate); \ No newline at end of file +export default helper(formattedDate); diff --git a/gui/app/utils/date.js b/gui/app/utils/date.js index e97a45c4..c4cf4abb 100644 --- a/gui/app/utils/date.js +++ b/gui/app/utils/date.js @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com @@ -24,7 +24,7 @@ function formatDate(date, format) { } function timeAgo(date) { - return moment(new Date(date)).fromNow(); + return moment(new Date(date)).local().fromNow(); } function timeAgoUTC(date) { @@ -37,4 +37,4 @@ export default { formatDate, timeAgo, timeAgoUTC -}; \ No newline at end of file +};