summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorClark Tomlinson <fallen013@gmail.com>2014-08-28 11:47:37 -0400
committerClark Tomlinson <fallen013@gmail.com>2014-08-28 11:47:37 -0400
commit54eb2f42df3c0e4684f0cbd29e507b99a5cfeb8f (patch)
treedc8fc3e5775750d4c8fb37fa40a0305498ea51b2 /settings/js
parentf4e6cd5f3ec7725900c7ef08092b1d673f302349 (diff)
parent92685acf60afaadcb659eb44b73a6a59de7bce2b (diff)
downloadnextcloud-server-54eb2f42df3c0e4684f0cbd29e507b99a5cfeb8f.tar.gz
nextcloud-server-54eb2f42df3c0e4684f0cbd29e507b99a5cfeb8f.zip
Merge pull request #10647 from owncloud/implementing_momentjs
Implementing momentjs
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users/users.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 60948bb99f3..0f72746ee83 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -96,9 +96,8 @@ var UserList = {
var lastLoginRel = t('settings', 'never');
var lastLoginAbs = lastLoginRel;
if(lastLogin !== 0) {
- lastLogin = new Date(lastLogin * 1000);
- lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000);
- lastLoginAbs = formatDate(lastLogin.getTime());
+ lastLoginRel = OC.Util.relativeModifiedDate(lastLogin);
+ lastLoginAbs = OC.Util.formatDate(lastLogin);
}
var $tdLastLogin = $tr.find('td.lastLogin');
$tdLastLogin.text(lastLoginRel);