194 Commits

Author	SHA1	Message	Date
Laurent Cozic	ea99099b48	Update French translation and fix a few mistakes in code	2021-08-19 10:48:26 +01:00
Laurent Cozic	06ed58b809	All: Improved sync locks so that they do not prevent upgrading a sync target	2021-08-18 15:49:43 +01:00
Ahmad Mamdouh	9b27b3b1fb	Plugins: Resolves #5288: Improved support for fitToContent webview property (#5298)	2021-08-18 12:09:45 +01:00
Laurent Cozic	7faa58e0f9	All: Add a way to disable a master key	2021-08-17 12:03:19 +01:00
Laurent Cozic	4c99400485	Desktop, Cli: Fixes #5325: Fixed file paths when exporting as HTML	2021-08-17 07:00:54 +01:00
Laurent Cozic	edc3496506	Tools: Fixed tests	2021-08-16 18:05:22 +01:00
Laurent Cozic	f5f05e6cc5	All: Added "None" sync target to allow disabling synchronisation	2021-08-16 16:18:32 +01:00
Laurent Cozic	fe4900d254	Desktop: Add Sync Wizard dialog	2021-08-16 15:20:14 +01:00
Laurent	dcd5a8d975	All: Improved E2EE usability by making its state a property of the sync target (#5276)	2021-08-12 16:54:10 +01:00
Laurent Cozic	3a22674c03	Merge branch 'release-2.2' into dev	2021-08-11 16:42:22 +01:00
Laurent Cozic	70cdaa3a22	Revert "Plugins: Add ability to make dialogs fit the application window (#5219)" ... This reverts commit c89037b4a2. Ref: https://github.com/laurent22/joplin/pull/5219#issuecomment-896702259	2021-08-11 11:25:14 +01:00
Laurent Cozic	d6eedc88c5	Doc: Update Plugin API intro	2021-08-10 12:17:03 +01:00
Laurent Cozic	c3f10d31cb	Chore: Convert E2EE related files to TypeScript	2021-08-07 12:22:37 +01:00
Laurent Cozic	e9d590169b	Desktop: Remove template feature (replaced by template plugin)	2021-08-06 10:58:32 +01:00
Laurent Cozic	f08af4d036	All: Fixes #5223: Fixed issue with orphaned resource being created in case of a resource conflict	2021-08-05 14:25:25 +01:00
Laurent Cozic	3348b4f6f8	Desktop: Fixes #5253: Fixed plugin state when it has been deleted outside the app	2021-08-05 12:48:39 +01:00
Laurent Cozic	7f00e4ea5b	Desktop: Turn old plugin deprecation notices into errors	2021-08-05 12:02:03 +01:00
Laurent Cozic	3a3aa701ac	Desktop, Cli: Fixes #5232: Do not export share properties	2021-07-25 11:51:50 +01:00
Laurent Cozic	07d2a60c75	Plugins: Add support for loading application chrome and note CSS from the plugin	2021-07-23 11:05:21 +01:00
Ahmad Mamdouh	c89037b4a2	Plugins: Add ability to make dialogs fit the application window (#5219)	2021-07-22 10:21:57 +01:00
Laurent Cozic	d469ac174c	Merge branch 'release-2.1' into dev	2021-07-19 10:42:22 +01:00
Laurent Cozic	cafaa9cac5	All: Ensure that timestamps are not changed when sharing or unsharing a note	2021-07-19 10:27:43 +01:00
Laurent Cozic	b2de27b6fc	Desktop: Make sure clipper authorisation notification is displayed, even when in config screen	2021-07-19 09:46:32 +01:00
John Freeman	3430f0bcae	Plugins: Fix type of PostMessageHandler (#5138)	2021-07-06 14:00:51 +01:00
Laurent Cozic	00b39e4671	Plugins: Add support for gotoAnything command so that it can be called from plugins	2021-06-27 14:14:11 +01:00
Laurent Cozic	8e35841d79	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-25 09:28:26 +01:00
JackGruber	8cbcb78ad1	All: Resolves #3871: Interpret only valid search filters (#5103)	2021-06-24 13:24:54 +01:00
Laurent Cozic	5ecac211ae	All: Fixed search when the index contains non-existing notes	2021-06-24 13:22:35 +01:00
Laurent Cozic	67d9977489	Desktop, Clipper: Web Clipper now must request authorisation before accessing the application data	2021-06-22 19:57:04 +01:00
Abdallah Ahmed	2e7e1948f8	Docs: Fix a typo in JoplinViewsDialogs.ts comments (#5108) ... Just fixed a small typo in the comments.	2021-06-21 13:32:17 +01:00
Laurent Cozic	5bb68ba65d	All: Fixed issue when trying to sync an item associated with a share that no longer exists	2021-06-20 19:29:59 +01:00
Laurent Cozic	112157e33f	Server: Fixed handling of max item size for encrypted items	2021-06-20 16:29:35 +01:00
Laurent Cozic	d13b1f96ba	fixed tests	2021-06-20 13:46:50 +01:00
Laurent Cozic	50ecdc2ff1	Plugins: Add support for read and writing text, HTML and images from/to clipboard	2021-06-20 12:03:18 +01:00
Laurent Cozic	097e49d797	All: Fixes #5051: Fixed error that could prevent a revision from being created, and that would prevent the revision service from processing the rest of the notes	2021-06-20 11:19:59 +01:00
Laurent Cozic	5b368e39ca	Mobile: Allow enabling and disabling feature flags	2021-06-19 17:32:36 +01:00
Laurent Cozic	ab9bbcbff2	Plugins: Fixed saving secure settings to the keychain, and added way to store plugin settings to settings.json	2021-06-19 15:56:37 +01:00
Laurent Cozic	0222c0f0a6	All: Allow uploading items in batch when synchronising with Joplin Server	2021-06-18 17:17:25 +01:00
Laurent Cozic	2867b66cf1	Tools: Fixed tests	2021-06-16 13:10:42 +01:00
Laurent Cozic	31121c86d5	Server: Fixed handling of user content URL	2021-06-15 17:24:04 +01:00
Laurent Cozic	a4a156c7a5	Desktop: Fixes #5080: Ensure resources are decrypted when sharing a notebook with Joplin Server	2021-06-15 17:17:12 +01:00
Laurent Cozic	85cc08c0d4	typo	2021-06-15 12:41:15 +01:00
Laurent Cozic	2cf70675dc	All: Fixed user content URLs when sharing note via Joplin Server	2021-06-15 12:25:55 +01:00
Ahmad Mamdouh	2af3bf61ea	All: Conflict notes will now populate a new field with the ID of the conflict note. (#5049)	2021-06-12 08:46:49 +01:00
JackGruber	01e6ca4616	All: Fixes: Wrong field removed in API search (#5066)	2021-06-11 00:24:50 +01:00
Laurent Cozic	a36b13dcb4	Server: Handle custom user content URLs	2021-06-10 19:33:04 +02:00
Laurent Cozic	5fd6571bf1	Desktop: Allow restoring a delete note from note history using command palette	2021-06-10 11:49:20 +02:00
Laurent Cozic	ca487ade9a	Desktop: Add "Retry all" button to sync status screen for items that could not be uploaded	2021-06-08 22:36:10 +02:00
Laurent Cozic	de7579a14e	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-07 18:04:45 +02:00
Laurent Cozic	3c41b45e8e	Server: Check share ID when uploading a note	2021-06-07 16:17:52 +02:00