374 Commits

Author	SHA1	Message	Date
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	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	ee02f8255e	All: Encryption setup on apps	2017-12-13 19:01:04 +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	e44975622a	CLI: Handling of password prompt	2017-12-12 18:17:30 +00:00
Laurent Cozic	238b5ab9b9	CLI: version bump to fix Homebrew formula	2017-12-08 21:41:41 +00:00
Laurent Cozic	027f96d100	Electron: Fixes #36: Set installation directory for Windows installer	2017-12-07 18:17:41 +00:00
Laurent Cozic	ad6c347180	CLI: Fixed shell mode	2017-12-07 18:12:46 +00:00
Laurent Cozic	37663bd110	Merge pull request #68 from dbinary/master ... adding translate spanish Latin America	2017-12-06 23:59:22 +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	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
Luis Pérez	4314c392f6	adding translate spanish Latin America	2017-12-04 13:24:55 -06:00
Laurent Cozic	ab8c66a361	Updated tools	2017-12-04 18:16:14 +00:00
Laurent Cozic	4b55fefcb1	Cleaned up build tools	2017-12-04 17:55:06 +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	6c3918ebd2	All: Improved Evernote import for blockquotes and sup tags	2017-12-02 12:49:42 +00:00
Laurent Cozic	ff502670bf	Updated Readme, mentioned Homebrew	2017-12-01 20:06:20 +00:00
Laurent Cozic	58bc708014	Merge branch 'master' of github.com:laurent22/joplin	2017-12-01 18:56:43 +00:00
Laurent Cozic	ede1ed8b22	macOS: Allow BACKSPACE instead of DELETE in CLI app	2017-12-01 18:56:35 +00:00
Laurent Cozic	9d984596cc	CLI: fixed crash when inputting command without closed quote	2017-12-01 17:51:27 +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	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	033d356b56	Removed dependency to marked and update locale	2017-11-28 18:07:49 +00:00
Laurent Cozic	9a40851c77	Electron, Mobile: Created alarm service and drivers	2017-11-27 22:50:46 +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	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	d7f3cfd778	All: Started moving sync glue logic to SyncTarget classes	2017-11-23 23:10:55 +00:00
Laurent Cozic	e4d48f43d6	Allow multiple selection	2017-11-22 18:35:31 +00:00
Laurent Cozic	27af0e69ef	Electron release v0.10.23	2017-11-21 18:26:17 +00:00
Laurent Cozic	f5feb595f6	Updated translation	2017-11-21 19:14:30 +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	1c1228bb88	Electron release v0.10.22	2017-11-20 18:59:13 +00:00
Laurent Cozic	7d9eec262a	Updated translation	2017-11-20 18:58:51 +00:00
Laurent Cozic	3d6fe4c2cd	Android: Fixed image picker issues	2017-11-20 19:01:19 +00:00