self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00
Code Issues Releases Activity
1,633 Commits 243 Branches 1,262 Tags 665 MiB
f460b2497a
Commit Graph

118 Commits

Author SHA1 Message Date
Laurent Cozic
c5214b6c44 Core: Fixed potential out-of-sync issue if user cancels while in the middle of delta step 2017-11-21 18:17:50 +00:00
Laurent Cozic
be77f15ef7 Electron: Fixed issue with conflict folder and fixed sync tests 2017-11-12 18:57:59 +00:00
Laurent Cozic
a1cb172bc3 Removed babel 2017-11-03 18:39:08 +00:00
Laurent Cozic
8a78ee5df6 Changed export to module.exports 2017-11-03 00:13:17 +00:00
Laurent Cozic
7781fbad76 Changed import statements to require to reduce dependency to Babel 2017-11-03 00:09:34 +00:00
Laurent Cozic
742cff5598 Improve sync conflict handling when the changes between local and remote don't matter 2017-11-02 22:48:17 +00:00
Laurent Cozic
6e49aa45c0 Fixed synchronization issue 2017-10-21 19:07:56 +01:00
Laurent Cozic
f228b48365 Various tweaks 2017-07-28 17:57:01 +00:00
Laurent Cozic
971c3e12dc Started support for onedrive tests 2017-07-26 21:00:16 +01:00
Laurent Cozic
d5e39d153f Support for tags 2017-07-25 19:36:52 +01:00
Laurent Cozic
a983a9f108 Tidy settings and sync creation 2017-07-24 18:58:11 +00:00
Laurent Cozic
0f95e97d19 Refactored handling of multiple sync targets 2017-07-24 18:01:40 +00:00
Laurent Cozic
d05c62f69f Fixed note edition 2017-07-23 15:11:44 +01:00
Laurent Cozic
5ca8647d35 Sync fixes 2017-07-19 20:15:55 +01:00
Laurent Cozic
7aa21174f6 Handle delta api for filesystem 2017-07-18 23:14:20 +01:00
Laurent Cozic
0c30c1b70b Fixed delta API for sync 2017-07-18 21:03:07 +01:00
Laurent Cozic
980e4bded1 Various changes 2017-07-18 19:27:10 +00:00
Laurent Cozic
268dfec554 Fixed sync issue with conflicted notes 2017-07-17 23:22:22 +01:00
Laurent Cozic
c2ba2105ff Change folder from RN 2017-07-16 17:06:05 +01:00
Laurent Cozic
24f61177d1 Improved handling of multiple sync targets 2017-07-16 13:53:59 +01:00
Laurent Cozic
7859a1b990 Fixed synchronizer conflict handling when deleting folders 2017-07-13 18:47:31 +00:00
Laurent Cozic
216a6780cb Fixes for release apk 2017-07-07 18:49:07 +00:00
Laurent Cozic
8751aa1a34 Better error handling during sync setup 2017-07-06 23:15:31 +01:00
Laurent Cozic
40ed3216a3 Fixed RN sync issue 2017-07-06 20:01:12 +00:00
Laurent Cozic
9e3a2a894e Fixed imports 2017-07-05 23:29:03 +01:00
Laurent Cozic
e323a86563 Various changes 2017-07-04 19:12:30 +00:00
Laurent Cozic
62c56044b0 Better handling of db errors 2017-07-04 18:09:47 +00:00
Laurent Cozic
c5e71a668c Fixed syncing of tags 2017-07-03 23:08:14 +01:00
Laurent Cozic
c28323bfab Clean up 2017-07-03 20:50:45 +01:00
Laurent Cozic
b36905cb3c tags 2017-07-03 18:58:01 +00:00
Laurent Cozic
dde3ea2008 Fixed tags and added unit tests 2017-07-03 18:29:19 +00:00
Laurent Cozic
ab312d70f5 Removed requirement for unique folder title 2017-07-03 18:03:14 +00:00
Laurent Cozic
09bcf8df35 Improved test unit 2017-07-02 22:01:37 +01:00
Laurent Cozic
8f5219fb79 Fixed note conflict sync 2017-07-02 21:40:50 +01:00
Laurent Cozic
a11acb0fa8 sync tags 2017-07-02 19:38:34 +01:00
Laurent Cozic
f04c1c58f1 Import Evernote tags 2017-07-02 16:46:03 +01:00
Laurent Cozic
d56fb48299 More sync checks 2017-07-02 11:34:07 +01:00
Laurent Cozic
71ae18c254 Unit test case when two clients both delete folders 2017-07-01 16:17:49 +01:00
Laurent Cozic
2ccb00b147 sync update 2017-07-01 13:12:00 +01:00
Laurent Cozic
bca694afeb Fixed deletion of synced folders 2017-07-01 11:30:50 +01:00
Laurent Cozic
51e38b4023 Sync fuzzing 2017-06-30 23:53:22 +01:00
Laurent Cozic
dc4982e17c Handle duplicate folder titles 2017-06-30 18:19:30 +00:00
Laurent Cozic
8d46752fe0 clean up 2017-06-30 18:09:49 +00:00
Laurent Cozic
0fb7463c7e Various fixes and added fuzzing program 2017-06-30 16:33:40 +01:00
Laurent Cozic
5f6db113cf Better handling of source 2017-06-29 21:52:52 +01:00
Laurent Cozic
9060ed489c Fixed onedrive sync issue 2017-06-29 18:03:16 +00:00
Laurent Cozic
6622f18f76 clean up 2017-06-25 16:17:40 +01:00
Laurent Cozic
cf494cfd17 Improve browsing of notes 2017-06-25 10:00:54 +01:00
Laurent Cozic
79e0bb2e65 Removed default folder concept 2017-06-25 08:52:25 +01:00
Laurent Cozic
38be57c1f6 Handle default folder 2017-06-25 00:19:11 +01:00
Laurent Cozic
58791b1963 re-organise code 2017-06-24 19:06:28 +01:00
Laurent Cozic
e521ca9427 Improved sync reporting 2017-06-24 18:40:03 +01:00
Laurent Cozic
45ac9daebe Improved logging handling 2017-06-23 22:32:24 +01:00
Laurent Cozic
bb822b44f2 clean up 2017-06-20 21:31:12 +01:00
Laurent Cozic
4b63500143 handle sync conflictgs 2017-06-20 19:25:01 +00:00
Laurent Cozic
a4374e3bdb sync fixes 2017-06-20 19:18:19 +00:00
Laurent Cozic
b3939887b8 handle deleted sync items 2017-06-19 23:18:24 +01:00
Laurent Cozic
c6ed94b446 Clean up 2017-06-19 20:26:27 +01:00
Laurent Cozic
cb7067ddf4 Handle sync conflicts 2017-06-19 20:18:22 +01:00
Laurent Cozic
baa1a01ed0 Handle sync conflicts 2017-06-19 18:58:49 +00:00
Laurent Cozic
02ff02a9d9 refactored sync class 2017-06-18 23:06:10 +01:00
Laurent Cozic
f9480cb882 sync 2017-06-18 21:19:13 +01:00
Laurent Cozic
2e8a56ad5e testing sync 2017-06-18 00:49:52 +01:00
Laurent Cozic
f0aa00945e sync 2017-06-15 19:18:48 +01:00
Laurent Cozic
efe7d0a45a sync 2017-06-15 00:14:15 +01:00
Laurent Cozic
d8f71e89df sync 2017-06-14 20:59:46 +01:00
Laurent Cozic
a0400a5e38 sync 2017-06-14 20:59:02 +01:00
Laurent Cozic
226353ecb7 Test sync 2017-06-13 23:39:45 +01:00