self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Fixed synchronizer conflict handling when deleting folders

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-13 18:47:31 +00:00
parent e397ad197d
commit 7859a1b990
12 changed files with 149 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/time-utils.js
View File

@@ -26,6 +26,10 @@ let time = {
return moment.unix(ms / 1000).format('DD/MM/YYYY HH:mm');
},
formatMsToLocal(ms, format) {
return moment.unix(ms / 1000).format(format);
},
msleep(ms) {
return new Promise((resolve, reject) => {
setTimeout(() => {