diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-28 18:04:27 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-28 18:04:27 +0500 |
commit | e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41 (patch) | |
tree | 769e7de1f1c12cc4d58d934709032bc1bcbdedc9 /web/react/utils | |
parent | 179c4ea684af8d2a021cc6f0042bc4408f39b0bb (diff) | |
parent | c6f3361d3caf671ca64b798d5ac9eca97c387f9e (diff) | |
download | chat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.tar.gz chat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.tar.bz2 chat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/utils')
-rw-r--r-- | web/react/utils/client.jsx | 14 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 8 |
2 files changed, 20 insertions, 2 deletions
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index a93257dd2..bf117b3b3 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -328,6 +328,20 @@ export function getConfig(success, error) { }); } +export function getAnalytics(teamId, name, success, error) { + $.ajax({ + url: '/api/v1/admin/analytics/' + teamId + '/' + name, + dataType: 'json', + contentType: 'application/json', + type: 'GET', + success, + error: (xhr, status, err) => { + var e = handleError('getAnalytics', xhr, status, err); + error(e); + } + }); +} + export function saveConfig(config, success, error) { $.ajax({ url: '/api/v1/admin/save_config', diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fadab27a7..3140a5d77 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -211,11 +211,15 @@ export function displayDateTime(ticks) { } interval = Math.floor(seconds / 60); - if (interval > 1) { + if (interval >= 2) { return interval + ' minutes ago'; } - return '1 minute ago'; + if (interval >= 1) { + return '1 minute ago'; + } + + return 'just now'; } export function displayCommentDateTime(ticks) { |