summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-04-17 06:49:46 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-04-17 06:49:46 -0700
commit867a52714853815da04ef8c43f70deaa2d6b55ee (patch)
treee3072fcfc13c703288b5feb8c8afa1dc2fdaf9fe /settings/js
parentec280e6f9f43e2f1d74c9ddf1e0fd64aabddc25f (diff)
parent4679e789e1bd1c485f2c7f74af8d20bcaff1e44f (diff)
downloadnextcloud-server-867a52714853815da04ef8c43f70deaa2d6b55ee.tar.gz
nextcloud-server-867a52714853815da04ef8c43f70deaa2d6b55ee.zip
Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/log.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/settings/js/log.js b/settings/js/log.js
index 81117f9e827..84f6d1aa5f3 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -55,7 +55,11 @@ OC.Log={
row.append(messageTd);
var timeTd=$('<td/>');
- timeTd.text(formatDate(entry.time*1000));
+ if(isNaN(entry.time)){
+ timeTd.text(entry.time);
+ } else {
+ timeTd.text(formatDate(entry.time*1000));
+ }
row.append(timeTd);
$('#log').append(row);
}