Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
938 Commits
244 Branches
1,281 Tags
606 MiB
Commit Graph

60 Commits (cc02c1d585ad375f10e74875c27aeaaf07ba8423)

Author SHA1 Message Date
Laurent Cozic cc02c1d585 All: Simplified synchronisation of resources to simplify encryption, and implemented resource encryption 2017-12-19 19:01:29 +00:00
Laurent Cozic 4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
Laurent Cozic df05d04dad All: Made model naming more consistent 2017-12-14 18:12:14 +00:00
Laurent Cozic 55266e5694 Fixed test units 2017-12-14 17:41:53 +00:00
Laurent Cozic 1008b1835b All: Handle tag encryption and started CLI and Electron encryption front-end 2017-12-14 00:23:32 +00:00
Laurent Cozic bd20ecff78 All: Handle conflict for encrypted notes 2017-12-13 22:53:20 +00:00
Laurent Cozic 5951ed3f55 All: Support encrypting notes and notebooks 2017-12-13 18:57:40 +00:00
Laurent Cozic 4abe5d07c4 All: Handling of impossible-to-sync items (such as when they are over the size limit of the cloud provider) 2017-12-04 23:38:09 +00:00
Laurent Cozic ab8c66a361 Updated tools 2017-12-04 18:16:14 +00:00
Laurent Cozic 0eac8b25e1 Deleted uneeded file 2017-12-03 23:06:02 +00:00
Laurent Cozic a96b91cfef All: Removed sync target info out of setting class 2017-11-24 19:21:30 +00:00
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 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 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 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 9e3a2a894e Fixed imports 2017-07-05 23:29:03 +01: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 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 f04c1c58f1 Import Evernote tags 2017-07-02 16:46:03 +01:00
Laurent Cozic 71ae18c254 Unit test case when two clients both delete folders 2017-07-01 16:17:49 +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 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 58791b1963 re-organise code 2017-06-24 19:06:28 +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