597 Commits

Author	SHA1	Message	Date
Laurent Cozic	71e877d369	All: Improved encryption and synchronisation	2018-01-02 20:17:14 +01:00
Laurent Cozic	500fbc5294	Merge branch 'master' into encryption	2017-12-31 15:26:16 +01:00
Laurent Cozic	6d0f60d9a1	All: Fixed tests and minor fixes	2017-12-31 15:23:05 +01:00
Laurent Cozic	e19c26fdd1	Mobile: Done UI for E2EE	2017-12-31 14:58:50 +01:00
Laurent Cozic	6ff19063ef	All: Got E2EE working in mobile app	2017-12-30 20:57:34 +01:00
Laurent Cozic	d180e7b5e1	Mobile: Handle encrypted items on UI side	2017-12-28 19:57:21 +00:00
Laurent Cozic	ab959623aa	CLI: Fixes #117: 'edit' command raising error in shell mode	2017-12-28 19:14:03 +00:00
Laurent Cozic	08d2655f13	All: Various improvements to E2EE	2017-12-26 11:38:53 +01:00
Laurent Cozic	bef7c38724	Electron: Improved enabling/disabling E2EE	2017-12-24 11:23:51 +01:00
Laurent Cozic	d1abf4971d	Electron: E2EE config	2017-12-24 09:36:31 +01:00
Laurent Cozic	d13c2cf8d7	All: Fixed reading file by chuncks	2017-12-23 21:21:11 +01:00
Laurent Cozic	70b03971f6	All: Fixed handling of unloaded master key	2017-12-22 18:50:27 +00:00
Laurent Cozic	6683da804b	All: Fixed various issues regarding encryption and decryptino of resources, and started doing GUI for Electron app	2017-12-21 20:06:08 +01:00
Laurent Cozic	7750b954fc	All: Make sure existing resources are encrypted once E2EE has been enabled	2017-12-20 19:43:43 +00:00
Laurent Cozic	edbff5a26a	All: Simplified encryption header	2017-12-20 19:14:27 +00:00
Laurent Cozic	18846c11ed	All: Allow disabling encryption and added more test cases	2017-12-20 20:45:25 +01:00
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
Laurent Cozic	7851b6b429	Version update	2017-12-02 15:57:19 +00:00
Laurent Cozic	1830ee9fd2	All: Fixed sync issue and database migration issue	2017-12-02 15:18:15 +00:00
Laurent Cozic	fe2c1c197e	All: fixed database creation error	2017-12-02 14:26:49 +00:00
Laurent Cozic	6c3918ebd2	All: Improved Evernote import for blockquotes and sup tags	2017-12-02 12:49:42 +00:00
Laurent Cozic	4dce9e9e47	Electron: Allow attaching multiple files	2017-12-01 23:26:08 +00:00
Laurent Cozic	dbeff4fd7d	All: Allow attaching files of unknown mime type	2017-12-01 23:15:49 +00:00
Laurent Cozic	ff502670bf	Updated Readme, mentioned Homebrew	2017-12-01 20:06:20 +00:00
Laurent Cozic	818537933a	Android: Fixes #53: Back button should exit app if nothing to go back to	2017-12-01 19:44:34 +00:00
Laurent Cozic	c72e0a14c0	Electron, Mobile: Fixed header sizes	2017-12-01 19:04:14 +00:00
Laurent Cozic	9d984596cc	CLI: fixed crash when inputting command without closed quote	2017-12-01 17:51:27 +00:00
Laurent Cozic	fe909f659d	All: Added error message for OneDrive for Business	2017-12-01 17:47:18 +00:00
Laurent Cozic	e1b1f31cf1	Electron: #22 Fixes keyboard cursor jumps while typing.	2017-12-01 00:00:18 +00:00
Laurent Cozic	6f26910243	Android v0.10.61	2017-11-30 21:47:55 +00:00
Laurent Cozic	2ef2296566	Update website	2017-11-30 20:30:01 +00:00
Laurent Cozic	16bf0cf646	All: Added Spanish (Costa Rica) locale	2017-11-30 18:29:10 +00:00
Laurent Cozic	7f1a14fa22	All: Fixed note update issue	2017-11-30 00:25:52 +00:00
Laurent Cozic	52f09d2638	Electron: Fixed import of certain images	2017-11-29 23:27:20 +00:00
Laurent Cozic	a346116d5f	Update website	2017-11-29 16:03:19 +00:00
Laurent Cozic	565c17df37	Mobile: Improved OneDrive login	2017-11-28 21:49:58 +00:00
Laurent Cozic	2e8fe88f53	Don't needlessly reload resources	2017-11-28 21:15:22 +00:00
Laurent Cozic	f5ff68b236	Android: test release	2017-11-28 20:35:39 +00:00
Laurent Cozic	d1a83d065a	Mobile: Added status info to view active alarms	2017-11-28 20:31:14 +00:00
Laurent Cozic	ddb73c8642	iOS: Fixed notification event	2017-11-28 20:23:22 +00:00
Laurent Cozic	4df73cd82c	iOS: Handle foreground notifications	2017-11-28 20:17:34 +00:00
Laurent Cozic	c446e4471d	Merge branch 'alarm-support' of github.com:laurent22/joplin into alarm-support	2017-11-28 17:29:31 +00:00
Laurent Cozic	1a610054d3	Android: Fixed cancelling of notification	2017-11-28 19:49:03 +00:00
Laurent Cozic	11517fa037	iOS: Get notifications to work	2017-11-28 19:36:47 +00:00
Laurent Cozic	67a457b9c5	Android: Got notifications to work	2017-11-28 18:58:04 +00:00
Laurent Cozic	18dc6c826a	Electron: Trigger notifications using node-notifier	2017-11-28 18:47:41 +00:00
Laurent Cozic	033d356b56	Removed dependency to marked and update locale	2017-11-28 18:07:49 +00:00
Laurent Cozic	f9f5974267	All: Added option to set date and time format	2017-11-28 18:02:54 +00:00
Laurent Cozic	6e23fead59	Electron: Getting notifications to work	2017-11-28 00:22:38 +00:00
Laurent Cozic	7df6541902	Merge branch 'alarm-support' of github.com:laurent22/joplin into alarm-support	2017-11-27 22:51:03 +00:00
Laurent Cozic	9a40851c77	Electron, Mobile: Created alarm service and drivers	2017-11-27 22:50:46 +00:00
Laurent Cozic	748acdf03f	Merge branch 'master' into alarm-support	2017-11-26 21:08:14 +00:00
Laurent Cozic	f51ad26db7	Release v0.10.59-android	2017-11-26 19:27:42 +00:00
Laurent Cozic	50ca686727	iOS: Added notification config	2017-11-24 18:27:41 +00:00
Laurent Cozic	3612529e52	iOS: Testing notification	2017-11-24 18:06:45 +00:00
Laurent Cozic	c053146885	iOS: Added notification config	2017-11-24 17:34:52 +00:00
Laurent Cozic	8ccf2ec521	Mobile: Trying RN notification	2017-11-24 20:14:56 +00:00
Laurent Cozic	0428917ea2	iOS: Updated version	2017-11-24 17:28:43 +00:00
Laurent Cozic	914a2554ab	All: Updated translations	2017-11-24 19:59:21 +00:00
Laurent Cozic	26bb7dc33b	All: Added dev sync target and option to select it in mobile	2017-11-24 19:47:24 +00:00
Laurent Cozic	8e5b0eadd9	All: Clean up	2017-11-24 19:26:49 +00:00
Laurent Cozic	a96b91cfef	All: Removed sync target info out of setting class	2017-11-24 19:21:30 +00:00
Laurent Cozic	03251d4c40	All: renamed sync targets	2017-11-24 19:09:15 +00:00
Laurent Cozic	112609c5f1	All: Moving sync target logic to SyncTarget classes	2017-11-24 18:59:16 +00:00
Laurent Cozic	cc7cbc2ecf	All: Started moving sync target logic under SyncTarget classes	2017-11-24 18:37:40 +00:00
Laurent Cozic	946ad7c71a	All: Started moving sync target logic under SyncTarget classes	2017-11-24 18:06:30 +00:00
Laurent Cozic	60d2b0c763	Merge branch 'master' into alarm-support	2017-11-24 17:09:24 +00:00
Laurent Cozic	d7f3cfd778	All: Started moving sync glue logic to SyncTarget classes	2017-11-23 23:10:55 +00:00
Laurent Cozic	9327a61a36	iOS: maybe bad change	2017-11-23 19:15:44 +00:00
Laurent Cozic	fbf7b2cc43	Mobile: Hide irrelevant settings	2017-11-23 18:54:26 +00:00
Laurent Cozic	d8b19f7d08	Mobile: Also do multi-selection from search page	2017-11-23 18:41:35 +00:00
Laurent Cozic	acc4eb5d28	Mobile: Allow selecting, deleting and moving multiple notes	2017-11-23 18:47:51 +00:00
Laurent Cozic	45a4034816	Android: Automate building for prod	2017-11-23 18:14:38 +00:00
Laurent Cozic	978a08fb06	Trying BuddyBuilder 72	2017-11-22 22:24:20 +00:00
Laurent Cozic	72dc5a6c99	Trying BuddyBuilder	2017-11-22 22:21:27 +00:00
Laurent Cozic	e4d48f43d6	Allow multiple selection	2017-11-22 18:35:31 +00:00
Laurent Cozic	cf832354a2	Updated website	2017-11-21 19:43:09 +00:00
Laurent Cozic	27af0e69ef	Electron release v0.10.23	2017-11-21 18:26:17 +00:00
Laurent Cozic	6283bf6190	Minor fixing on note rendering	2017-11-21 19:47:29 +00:00
Laurent Cozic	48b648e656	Electron: allow disabling auto-updates	2017-11-21 19:37:34 +00:00
Laurent Cozic	367a18db93	Electron: fixed loading of resources, and disable drag and dropping of links in app	2017-11-21 19:31:21 +00:00
Laurent Cozic	f5feb595f6	Updated translation	2017-11-21 19:14:30 +00:00
Laurent Cozic	c6ec0279fc	Mobile: Made checkboxes smaller	2017-11-21 19:05:59 +00:00
Laurent Cozic	3722012da5	Added command to export debug information from mobile and CLI	2017-11-21 18:48:50 +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	8dbec0e8f4	Put locales under versioning	2017-11-20 19:14:02 +00:00
Laurent Cozic	518feadc3e	All: Better checkbox alignment and added padding on notebook title	2017-11-20 18:40:36 +00:00
Laurent Cozic	b1e351ce77	Merge branch 'master' of github.com:laurent22/joplin	2017-11-20 18:31:10 +00:00
Laurent Cozic	c6cb2800d7	Android: improved image type detection	2017-11-20 19:18:49 +00:00
Laurent Cozic	3d6fe4c2cd	Android: Fixed image picker issues	2017-11-20 19:01:19 +00:00
Laurent Cozic	da7034ae08	iOS: Improved icon and fixed file attachement issue	2017-11-20 18:29:39 +00:00
Laurent Cozic	37de5fd4b3	Mobile: Improved loading of images. Added privacy policy url.	2017-11-20 18:25:23 +00:00
Laurent Cozic	4de044dc90	Fix Android/iOS inconsitency with webview page scaling	2017-11-20 00:21:40 +00:00
Laurent Cozic	d5dc27d788	Use SVG icons for checkboxes	2017-11-19 23:34:41 +00:00
Laurent Cozic	e80dd59da2	iOS: Fixed attaching images	2017-11-19 22:08:58 +00:00
Laurent Cozic	cbd2075156	Merge branch 'ios-fixes-2' of github.com:laurent22/joplin into ios-fixes-2	2017-11-19 15:21:41 +00:00
Laurent Cozic	4b5c1491d0	iOS: various fixes	2017-11-19 15:19:36 +00:00
Laurent Cozic	ea077852a1	Mobile: allow attaching image or any other file	2017-11-19 15:18:07 +00:00
Laurent Cozic	ca20a2a1c2	Dropdown fioxes	2017-11-19 00:23:18 +00:00
Laurent Cozic	37c0b6d24a	iOs tweaks	2017-11-19 00:03:42 +00:00
Laurent Cozic	0c14a42b28	RN: Replaced broken Picker by custom dropdown	2017-11-18 23:59:07 +00:00