1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00
joplin/ElectronClient
Laurent Cozic f550d847c4 Desktop: Resolves #2688: Add "Retry All" option to synchronisation page
Based on pull request #2712 by fhfuih

commit 7d3815e51dbf682ecc1ed3544a15e51b79d5d12d
Author: Laurent Cozic <laurent@cozic.net>
Date:   Sat Apr 4 18:26:01 2020 +0100

    Fix issues

commit dad1d2c4d4eb37fdd23096a3344cf4f14498e335
Merge: 16cf0a3058 0a1ba511ea
Author: Laurent Cozic <laurent@cozic.net>
Date:   Sat Apr 4 18:09:46 2020 +0100

    Merge branch 'master' of https://github.com/fhfuih/joplin into fhfuih-master

commit 0a1ba511ea
Merge: 6207b42044 bdd760f343
Author: fhfuih <fhfuih@outlook.com>
Date:   Sat Mar 14 20:30:27 2020 -0400

    Merge branch 'master' into master

commit 6207b42044
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Sat Mar 14 20:13:28 2020 -0400

    Decryption Retry All RN frontend

commit 6f46d1985f
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Sat Mar 14 20:10:55 2020 -0400

    Decryption Retry All backend & desktop

commit 4c3d37b311
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Fri Mar 13 13:21:21 2020 -0400

    Revert "Add "retry all" option to synchronisation page"

    This reverts commit 15daaa16fd.

commit cffc919791
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Fri Mar 13 13:19:51 2020 -0400

    Revert "Refactor "retry all" renderer to avoid hacks"

    This reverts commit 51ba6ea655.

commit 51ba6ea655
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Tue Mar 10 18:27:22 2020 -0400

    Refactor "retry all" renderer to avoid hacks

commit 57d71712e1
Merge: 15daaa16fd b367955e56
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Mon Mar 9 20:42:02 2020 -0400

    Merge branch 'master' of https://github.com/fhfuih/joplin

commit 15daaa16fd
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Mon Mar 9 20:36:09 2020 -0400

    Add "retry all" option to synchronisation page
2020-04-04 18:30:13 +01:00
..
build Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
css Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
fonts Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
gui Desktop: Resolves #2688: Add "Retry All" option to synchronisation page 2020-04-04 18:30:13 +01:00
locales Update translations 2020-03-30 11:03:18 -04:00
plugins Desktop: Close Goto Anything modal on outside click (#2940) 2020-03-30 18:33:36 +01:00
tools Tools: Fixed Electron build 2020-03-30 18:03:02 +01:00
.gitignore Desktop: Resolves #176: Added experimental WYSIWYG editor (#2556) 2020-03-09 23:24:57 +00:00
app.js Revert "Desktop: Fixes #2467: Menu items were not disabled in viewer-only mode (#2576)" 2020-03-21 13:18:37 +00:00
bridge.js Desktop: Add button to About box to copy Joplin's information to the clipboard (#2711) 2020-03-12 23:13:18 +00:00
checkForUpdates.js Tools: Apply "curly" eslint rule 2020-03-13 23:57:34 +00:00
dev-app-update.yml-FORTESTING Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
ElectronAppWrapper.js Desktop: Add global shortcut to show/hide Joplin (#2653) 2020-03-16 00:36:18 +00:00
envFromArgs.js Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
eventManager.js Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
gulpfile.js Desktop: Added support for checkboxes and fixed various issues with WYSIWYG editor 2020-03-23 00:47:25 +00:00
index.html Desktop: Resolves #176: Added experimental WYSIWYG editor (#2556) 2020-03-09 23:24:57 +00:00
InteropServiceHelper.js Desktop: Add friendly default filenames to export options (#2749) 2020-04-03 00:24:33 +01:00
main-html.js Tools: Enforce and apply eslint rules prefer-const and no-var 2020-03-13 23:46:14 +00:00
main.js Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
package-lock.json Electron release v1.0.197 2020-03-30 18:03:36 +01:00
package.json Electron release v1.0.197 2020-03-30 18:03:36 +01:00
style.css Tools: Improve and simplify how to build the apps (#2538) 2020-02-20 22:59:18 +00:00
theme.js Desktop: WYSIWYG: Apply theme to toolbar 2020-04-03 18:12:14 +00:00