1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-12 22:57:38 +02:00
Commit Graph

96 Commits

Author SHA1 Message Date
cc02c1d585 All: Simplified synchronisation of resources to simplify encryption, and implemented resource encryption 2017-12-19 19:01:29 +00:00
3f4f154949 All: Refactored encryption/decryption method to use same algorithm for both file and string encryption 2017-12-18 20:54:03 +01:00
4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
df05d04dad All: Made model naming more consistent 2017-12-14 18:12:14 +00:00
55266e5694 Fixed test units 2017-12-14 17:41:53 +00:00
5951ed3f55 All: Support encrypting notes and notebooks 2017-12-13 18:57:40 +00:00
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
9a40851c77 Electron, Mobile: Created alarm service and drivers 2017-11-27 22:50:46 +00:00
a96b91cfef All: Removed sync target info out of setting class 2017-11-24 19:21:30 +00:00
03251d4c40 All: renamed sync targets 2017-11-24 19:09:15 +00:00
112609c5f1 All: Moving sync target logic to SyncTarget classes 2017-11-24 18:59:16 +00:00
cc7cbc2ecf All: Started moving sync target logic under SyncTarget classes 2017-11-24 18:37:40 +00:00
d7f3cfd778 All: Started moving sync glue logic to SyncTarget classes 2017-11-23 23:10:55 +00:00
be77f15ef7 Electron: Fixed issue with conflict folder and fixed sync tests 2017-11-12 18:57:59 +00:00
8a78ee5df6 Changed export to module.exports 2017-11-03 00:13:17 +00:00
7781fbad76 Changed import statements to require to reduce dependency to Babel 2017-11-03 00:09:34 +00:00
6e49aa45c0 Fixed synchronization issue 2017-10-21 19:07:56 +01:00
f228b48365 Various tweaks 2017-07-28 17:57:01 +00:00
971c3e12dc Started support for onedrive tests 2017-07-26 21:00:16 +01:00
a983a9f108 Tidy settings and sync creation 2017-07-24 18:58:11 +00:00
0f95e97d19 Refactored handling of multiple sync targets 2017-07-24 18:01:40 +00:00
d05c62f69f Fixed note edition 2017-07-23 15:11:44 +01:00
5ca8647d35 Sync fixes 2017-07-19 20:15:55 +01:00
7aa21174f6 Handle delta api for filesystem 2017-07-18 23:14:20 +01:00
24f61177d1 Improved handling of multiple sync targets 2017-07-16 13:53:59 +01:00
216a6780cb Fixes for release apk 2017-07-07 18:49:07 +00:00
8751aa1a34 Better error handling during sync setup 2017-07-06 23:15:31 +01:00
40ed3216a3 Fixed RN sync issue 2017-07-06 20:01:12 +00:00
9e3a2a894e Fixed imports 2017-07-05 23:29:03 +01:00
c5e71a668c Fixed syncing of tags 2017-07-03 23:08:14 +01:00
b36905cb3c tags 2017-07-03 18:58:01 +00:00
dde3ea2008 Fixed tags and added unit tests 2017-07-03 18:29:19 +00:00
ab312d70f5 Removed requirement for unique folder title 2017-07-03 18:03:14 +00:00
a11acb0fa8 sync tags 2017-07-02 19:38:34 +01:00
f04c1c58f1 Import Evernote tags 2017-07-02 16:46:03 +01:00
6622f18f76 clean up 2017-06-25 16:17:40 +01:00
58791b1963 re-organise code 2017-06-24 19:06:28 +01:00
e521ca9427 Improved sync reporting 2017-06-24 18:40:03 +01:00
45ac9daebe Improved logging handling 2017-06-23 22:32:24 +01:00
a4374e3bdb sync fixes 2017-06-20 19:18:19 +00:00
cb7067ddf4 Handle sync conflicts 2017-06-19 20:18:22 +01:00
baa1a01ed0 Handle sync conflicts 2017-06-19 18:58:49 +00:00
f9480cb882 sync 2017-06-18 21:19:13 +01:00
2e8a56ad5e testing sync 2017-06-18 00:49:52 +01:00
f0aa00945e sync 2017-06-15 19:18:48 +01:00
a0400a5e38 sync 2017-06-14 20:59:02 +01:00