diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-04-07 17:31:30 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-04-07 17:31:30 +0000 |
| commit | 9edf45a324c2f1d4532d02e5c8fa37ebfa0c9dab (patch) | |
| tree | d7d33a1968370791ec054b5ac4442c41d64498b0 /core/js/js.js | |
| parent | d2886f202024243ae4d92e2eea9d3726037a9601 (diff) | |
| parent | d1ae6512cc760c76798a5a8636d1d7908c706ae8 (diff) | |
| download | nextcloud-server-9edf45a324c2f1d4532d02e5c8fa37ebfa0c9dab.tar.gz nextcloud-server-9edf45a324c2f1d4532d02e5c8fa37ebfa0c9dab.zip | |
Merge branch 'master' into migration
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index df1b5c6ce76..44b4f503b8c 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -126,7 +126,13 @@ OC={ }); } }, - dialogs:OCdialogs + dialogs:OCdialogs, + mtime2date:function(mtime) { + mtime = parseInt(mtime); + var date = new Date(1000*mtime); + var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes(); + return ret; + } }; OC.search.customResults={}; OC.search.currentResult=-1; |