481 Commits

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	26bf7c4d46	All: Improved file and memory drivers to make it easier to use same sync method for all the drivers	2017-12-18 21:47:25 +01:00
Laurent Cozic	2959fa1080	All: Added uploadBlob method to Node apps	2017-12-18 21:46:22 +01:00
Laurent Cozic	3f4f154949	All: Refactored encryption/decryption method to use same algorithm for both file and string encryption	2017-12-18 20:54:03 +01:00
Laurent Cozic	4c0b472f67	All: Testing and better handling of E2EE initialisation	2017-12-17 20:51:45 +01:00
Laurent Cozic	f5d26e0d81	All: Fixed filesystem driver bug when downloading resources. Added support for encrypting all items when encryption enabled.	2017-12-14 21:12:02 +00:00
Laurent Cozic	e9bb5bee9d	All: Better handling of encrypted data on UI side and prevent modification of encrypted notes	2017-12-14 20:21:36 +00:00
Laurent Cozic	2c608bca3c	All: getting encryption service and UI to work	2017-12-14 19:39:13 +00:00
Laurent Cozic	d9c1e30e9b	Merge master into encryption branch	2017-12-15 07:31:57 +00:00
Laurent Cozic	5bc72e2b44	All: Decryption worker and handling of missing master key passwords	2017-12-14 18:53:08 +00:00
Laurent Cozic	df05d04dad	All: Made model naming more consistent	2017-12-14 18:12:14 +00:00
Laurent Cozic	888ac8f4c2	Electron: Started integrating encryption	2017-12-14 17:58:10 +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	f6fbf3ba0f	All: Handle master key in backend	2017-12-12 21:58:57 +00:00
Laurent Cozic	9bce52a92a	All: Utilities to create and encrypt master keys	2017-12-12 18:41:02 +00:00
Laurent Cozic	92b857d83b	All: Added methods to get secure random bytes	2017-12-12 17:51:07 +00:00
Laurent Cozic	8a282fd2e1	All: Added fs drivers and encryption service	2017-12-11 23:52:42 +00:00
Laurent Cozic	0f343bccda	Electron: resolve #7: Show storage location in Options screen	2017-12-08 21:51:59 +00:00
Laurent Cozic	a513f6f3f0	Merge branch 'master' of github.com:laurent22/joplin	2017-12-08 21:42:37 +00:00
Laurent Cozic	3b4809714e	iOS: version 0.10.6	2017-12-08 21:42:09 +00:00
Laurent Cozic	08d9e9b6aa	All: Added support for HTML tags found in ENEX files: colgroup, col, ins, kbd, address, caption, var, area, map	2017-12-08 17:41:32 +00:00
Laurent Cozic	b929b46281	Mobile: Fixed dropdown positioning	2017-12-07 23:24:14 +00:00
Laurent Cozic	5c4a536dad	Android v0.10.65	2017-12-07 23:11:34 +00:00
Laurent Cozic	91e337307c	Mobile: Upgrade react-native-popup-menu to fix scrolling bug	2017-12-07 23:00:22 +00:00
Laurent Cozic	2855b68ed4	Merge branch 'master' of github.com:laurent22/joplin	2017-12-07 22:56:41 +00:00
Laurent Cozic	45ca6284f9	iOS: Added safe area for iPhone X support	2017-12-07 22:42:40 +00:00
Laurent Cozic	145ee13356	Merge branch 'master' of github.com:laurent22/joplin	2017-12-07 22:42:08 +00:00
Laurent Cozic	6f97747199	Electron: Add support for file system sync	2017-12-07 22:29:02 +00:00
Laurent Cozic	f3751e4ba6	Mobile: Fixed auto-assignment of title for new notes	2017-12-07 21:32:22 +00:00
Laurent Cozic	5cd55cada6	Mobile: Made context menu scrollable	2017-12-07 21:23:41 +00:00
Laurent Cozic	bad4b2ecb8	Electron: Added dialog to export sync status	2017-12-07 21:18:18 +00:00
Laurent Cozic	f242a3c215	Merge branch 'fix-cli'	2017-12-07 17:43:44 +00:00
Laurent Cozic	ad6c347180	CLI: Fixed shell mode	2017-12-07 18:12:46 +00:00
Laurent Cozic	4f0431da55	Merge branch 'master' of github.com:laurent22/joplin	2017-12-07 13:33:26 +00:00
Laurent Cozic	b873fdd029	iOS: Release	2017-12-07 17:46:59 +00:00
Laurent Cozic	7008daf92a	All: Improved handling of empty links when importing ENEX files. Fixed minor layout issues in Electron app	2017-12-07 00:57:36 +00:00
Laurent Cozic	ed914c6907	All: Improved rendering of imported ENEX tables	2017-12-07 00:35:15 +00:00
Laurent Cozic	8838017830	All: Updated translations	2017-12-06 23:55:22 +00:00
Laurent Cozic	507e7e6014	All: Improved ENEX import for web pages that have been saved as notes	2017-12-06 19:29:58 +00:00
Laurent Cozic	f42908b11c	Merge branch 'sync-limits'	2017-12-05 17:30:16 +00:00
Laurent Cozic	03ec406627	All: Filter to sync target and refactored so that same code can be used by all clients	2017-12-05 19:21:01 +00:00
Laurent Cozic	c703521b6c	All: Handling of unsyncable items	2017-12-05 18:56:39 +00:00
Laurent Cozic	cf97bf9a77	Updated readme	2017-12-05 08:47:48 +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	f6633e23f5	Minor tweaks	2017-12-04 23:01:22 +00:00
Laurent Cozic	a6d6201ecb	All: Improved synchronisation process and saving of models so that reducer can deal with full objects	2017-12-04 22:58:42 +00:00
Laurent Cozic	73e81a54b4	All: Fixed sync issue when target does not have reliable timestamps	2017-12-04 18:39:40 +00:00
Laurent Cozic	0eac8b25e1	Deleted uneeded file	2017-12-03 23:06:02 +00:00