self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
9,103 Commits 244 Branches 1,266 Tags 536 MiB
af91fd99cc
Commit Graph

191 Commits

Author SHA1 Message Date
Laurent Cozic
3725b14e04 Revert "Desktop: Fixes #5686: Fixed Tags Order (#6136)" 
This reverts commit 07f128ae95.

Due to regression: https://github.com/laurent22/joplin/issues/6301
 2022-03-28 17:40:51 +01:00
Laurent Cozic
299a14755a All: Resolves #6209: Handle invalid revision patches 2022-03-03 13:20:29 +00:00
OmGole
07f128ae95
Desktop: Fixes #5686: Fixed Tags Order (#6136) 2022-03-02 18:11:14 +00:00
Laurent Cozic
20784b0e99 Desktop: Resolves #5531: Prevent certain errors from stopping the revision service 2022-02-27 10:30:40 +00:00
Laurent Cozic
a325bf6dc6 All: Improve error message when revision metadata cannot be decoded, to improve debugging 2022-02-26 18:20:23 +00:00
Laurent Cozic
de757026d4 All: Fixes #6092: Shared resource was not encrypted with correct encryption key 2022-02-11 10:38:45 +00:00
Laurent
9f252ea673
Desktop: Add support for custom notebook icons (#6110) 2022-02-06 16:42:00 +00:00
Vincent Jo
288ae1b463
All: Add additional time format HH.mm (#6086) 2022-02-03 18:52:24 +00:00
Helmut K. C. Tessarek
3dfe43204d
Desktop: Fix wording "Check for updates" in settings (#5832) 2022-01-09 11:23:24 +00:00
Laurent Cozic
1ad5638ade Update translations 2021-12-21 18:16:25 +01:00
Laurent Cozic
721d00874f All: Do no duplicate resources when duplicating a note 2021-12-21 11:03:55 +01:00
Laurent Cozic
667d6420f2 All: Fixed issue where synchroniser would try to update a shared folder that is not longer accessible 2021-12-20 15:47:50 +01:00
Laurent Cozic
4faba40b1e translations 2021-12-17 01:12:30 +01:00
Laurent Cozic
c26ce462e8 Fix AWS string names 2021-12-17 00:45:00 +01:00
Laurent
6bbf053a4f
Tools: Run Joplin Server Postgres tests on CI (#5807) 2021-11-30 15:37:07 +00:00
Laurent Cozic
605f12552e All: Fixes #5796: Handle duplicate attachments when the parent notebook is shared 2021-11-28 16:46:44 +00:00
Laurent Cozic
c0a8c330a9 All: Also duplicate resources when duplicating a note 
Ref: https://github.com/laurent22/joplin/issues/5796
 2021-11-27 16:05:28 +00:00
Lee Matos
5981227c06
All: Improved S3 sync error handling and reliability, and upgraded S3 SDK (#5312) 2021-11-24 23:03:03 +00:00
Helmut K. C. Tessarek
8bebf99950
All: Add date format YYYY/MM/DD (#5759) 2021-11-19 17:29:27 +00:00
Laurent Cozic
e97bb78ce4 Desktop, Mobile: Added support for notebook icons 2021-11-15 17:19:51 +00:00
Laurent Cozic
405b49569c Desktop: Fixes #5720: Plugin secure settings would be lost if keychain is not enabled 2021-11-14 19:06:48 +00:00
Kenichi Kobayashi
f495db1391
Desktop: Sort Order Buttons and Per-Notebook Sort Order (#5437) 2021-11-11 15:33:37 +00:00
Laurent
af19865865
All, Server: Add support for sharing notes when E2EE is enabled (#5529) 2021-11-03 16:24:40 +00:00
Laurent Cozic
e247be1fa7 Desktop: Fixed default migration logic 2021-10-28 22:26:23 +01:00
Laurent Cozic
72db8e469d All: Added mechanism to migrate default settings to new values 2021-10-18 12:37:25 +01:00
Laurent Cozic
ccf9882452 All: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens 2021-10-15 12:38:14 +01:00
Laurent Cozic
fb935dde18 Tools: Added syncDebugLog to help debugging sync operations 2021-10-15 12:24:22 +01:00
Laurent Cozic
0ccd8dee41 Tools: Fixed TSC compile error 2021-10-14 16:34:53 +01:00
Laurent Cozic
73545484c9 Desktop: Allows a shared notebook recipient to leave the notebook 2021-10-14 15:39:17 +01:00
Laurent Cozic
5a9bc1297b All: Fixes #932: Certain attachments were not being automatically deleted 2021-10-05 17:47:38 +01:00
Helmut K. C. Tessarek
5c7dcf0117
Mobile: Resolves #4701: Improve delete dialog message (#5481) 2021-10-03 18:41:32 +01:00
Laurent
c758377188
All: Add support for public-private key pairs and improved master password support (#5438) 
Also improved SCSS support, which was needed for the master password dialog.
 2021-10-03 16:00:49 +01:00
Laurent Cozic
4b39d30255 All: Fix default sync target 2021-09-29 19:27:26 +01:00
Laurent Cozic
9f17b28f85 Chore: Cleaned up server UserItem interface 2021-09-25 19:51:44 +01:00
Laurent Cozic
96ac12b460 Chore: Converted encryption config screens to React Hooks to share logic between desktop and mobile 2021-09-10 19:05:47 +01:00
Laurent Cozic
b88b747ba6 Api: Resolves #5199: Add support for "events" end point to retrieve info about latest note changes 2021-08-30 18:53:24 +01:00
Laurent Cozic
ce89ee5bab All: Add support for single master password, to simplify handling of multiple encryption keys 2021-08-30 14:15:35 +01:00
Laurent Cozic
7faa58e0f9 All: Add a way to disable a master key 2021-08-17 12:03:19 +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 Cozic
8063c94ff7 Desktop: Allow setting a max width for the editor content 2021-08-14 12:19:53 +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
6927335330 Revert: All: Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212) 
Revert commit d2e2866995

Ref: https://github.com/laurent22/joplin/issues/5287
 2021-08-11 11:24:01 +01:00
Lee Matos
d2e2866995
All: Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212) 2021-08-09 19:03:03 +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
8e4be78013
Desktop: Make Markdown editor styling closer to view styling (#5174) 2021-07-16 11:32:29 +01:00
Laurent Cozic
8395d5daa9 Mobile: Added new beta editor based on CodeMirror 6 2021-07-13 19:13:13 +01:00
Laurent Cozic
8e789ee2ee Desktop: Fixed issue where untitled notes where created after a note had been shared and synced 2021-07-02 18:14:49 +01:00
Laurent Cozic
d34a92d581 Desktop: Fixes #5133: Items keep being uploaded to Joplin Server after a note has been shared 2021-07-02 17:53:36 +01:00
Laurent Cozic
3d03321328 All: Activate Joplin Server optimisations 2021-06-26 10:19:48 +01:00
Laurent Cozic
96931877cf Desktop: Fix: Notes would appear to be in the wrong notebook after having been shared 2021-06-23 14:38:14 +01:00
Laurent Cozic
118a2f9f25 All: Also allow disabling TLS errors for Joplin Cloud to go around error UNABLE_TO_GET_ISSUER_CERT_LOCALLY 2021-06-23 11:37:50 +01:00
Laurent Cozic
caabdbd815 Desktop: Fixed note history line count information (Regression) 2021-06-21 10:06:36 +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
9323caf2f1 Fixed revision issue for old revisions 2021-06-20 13:59:58 +01:00
Laurent Cozic
8e55fe31ee fix tests 2021-06-20 12:30:45 +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
326fef486c All: Added feature flags to disable Joplin Server sync optimisations by default, so that it still work with server 2.0 2021-06-19 14:22:53 +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
1c597883ef Chore: Clean up synchronizer code and add types 2021-06-17 12:39:06 +01:00
Laurent Cozic
15ce5cdd6e All: Optimise first synchronisation, when items have never been synced before 2021-06-17 11:24:02 +01:00
Laurent Cozic
313c8bbe8c Desktop: Fixes #5086: Prevent app from crashing when loading a setting value that has been removed 2021-06-16 18:22:32 +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
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
Laurent Cozic
b2b6ad479a Revert "Desktop: Make font size consistent between Markdown and Rich Text editors" 
This reverts commit a058e09183.

Reverts because this change means the settings are directly accessed
from the theme, which makes the themes unusable from Joplin Server.
 2021-06-10 10:59:15 +02:00
Laurent Cozic
56fdf97693 Desktop: Fixes #5034: Certain resource paths could be corrupted when saved from the Rich Text editor 2021-06-08 20:37:44 +02:00
Laurent Cozic
a058e09183 Desktop: Make font size consistent between Markdown and Rich Text editors 2021-06-08 20:21:11 +02:00
Laurent Cozic
de45740129 Server: Load shared user content from correct domain 2021-06-06 19:14:12 +02:00
Laurent Cozic
21ea3253db Desktop: Add Joplin Cloud sync target 2021-06-03 17:12:07 +02:00
Laurent Cozic
1d2a3a97d2 Keep Joplin Server name for now 2021-06-02 09:56:24 +02:00
Laurent Cozic
5f94de0f24 Fixed tests 2021-05-27 15:44:07 +02:00
Laurent Cozic
b20ab19f13 Desktop: Rename Joplin Server to Joplin Cloud in UI 2021-05-25 12:16:57 +02:00
Laurent Cozic
2806aa1b19 Tools: Moved lib-specific tests under lib package 2021-05-21 15:17:21 +02:00
Laurent Cozic
f7d164be6e Desktop: Allow unsharing a note 2021-05-16 17:28:49 +02:00
Laurent Cozic
15fe119256 Desktop: Made sync more reliable by making it skip items that time out, and improved sync status screen 2021-05-15 20:56:49 +02:00
Laurent Cozic
a31b402b9e Desktop: Added button to skip an application update 
And made auto-updates enabled by default
 2021-05-14 11:29:06 +02:00
Laurent
0765cf5955
All: Add support for sharing notebooks with Joplin Server (#4772) 
- Joplin Server: Adds support for sharing a notebook
- Desktop: Adds support for sharing a notebook with Joplin Server
- Mobile: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
- Cli: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
 2021-05-13 17:57:37 +01:00
Helmut K. C. Tessarek
fa6981faa8
All: Add new date format YYMMDD (#4954) 2021-05-13 08:55:41 +01:00
Laurent Cozic
a6caa357c8 Desktop: Add synchronization tools to clear local sync state or data 2021-05-03 12:57:46 +02:00
JackGruber
156a681ecf
All: Add "id" and "due" search filters (#4898) 2021-04-29 15:27:38 +01:00
Roman Musin
a4854fcde8
Android: Fixes #4439: Add option to disable TLS validation and allow self-signed certificates for WebDAV/NextCloud (#4742) 2021-04-25 09:50:52 +01:00
Laurent Cozic
3235f58f5a Desktop: Resolves #4727: Add support for safe mode, which temporarily disables note rendering and plugins 2021-04-24 20:23:33 +02:00
JackGruber
0aef1f95ef
All: Resolves #3157: Also duplicate the tags when the note is duplicated (#4876) 2021-04-24 09:16:36 +01:00
Laurent Cozic
7518ac00fc Desktop: Fixes #4562: Ensure that invalid plugin settings do not crash the application 2021-04-11 11:51:40 +02:00
Caleb John
f721d0123e
Update wording for font settings (#4765) 2021-04-08 10:14:17 +01:00
Laurent Cozic
5667e687e9 Desktop: Regression: Fixed handling of provisional status of note 2021-04-07 18:57:44 +02:00
mbalint
c516ab405b
Mobile: Resolves #720: Add "Sync only on Wi-Fi" option (#4729) 2021-03-29 09:35:39 +01:00
Caleb John
81b3ddf0e7
Desktop: Add monospace enforcement for certain elements in Markdown editor (#4689) 2021-03-26 09:08:22 +00:00
Laurent Cozic
8ba49c6fdf Desktop: Add support for strikethrough, sub, sup and insert formatting on Rich Text editor 2021-03-17 09:48:01 +00:00
Laurent Cozic
f3b2ca4752 Desktop: Add support for higlighting text from Rich Text editor 2021-03-16 19:39:35 +00:00
Laurent Cozic
9bfc7d9860 Fixed tests 2021-02-09 20:58:17 +00:00
Laurent Cozic
71f976f6a5 Desktop, Cli: Save user settings to JSON file 2021-02-09 17:54:29 +00:00
Laurent Cozic
6dcb145732 Desktop: Give plugin config section without an icon, a default icon 2021-02-07 12:59:58 +00:00
Laurent Cozic
ccbc329cbf Server: Add support for sharing notes via a link 2021-01-29 18:45:11 +00:00
Laurent Cozic
cbd842c268 Plugins: Add support for plugins.dataDir function, to provide a path for plugin to store its own data 2021-01-24 15:51:35 +00:00
Laurent Cozic
63559ac8b9 Tools: Apply eslint rule "no-multi-spaces" 2021-01-23 15:51:19 +00:00
Laurent Cozic
86610e7561 Converted models and services to TypeScript 2021-01-22 17:41:11 +00:00