Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,820 Commits
244 Branches
1,281 Tags
626 MiB
Commit Graph

481 Commits (d5eb21d3183400d4bba95cf4ab3d32980b8f01f5)

Author SHA1 Message Date
Roman f42fd0ecce Fix enum usage 2021-08-20 21:43:37 +01:00
Roman 62c5f433d7 Rename enum values 2021-08-20 21:24:16 +01:00
Roman Musin e73a4b7286
Merge branch 'dev' into desktop-protocol 2021-08-20 12:02:11 +01:00
Helmut K. C. Tessarek 45e35576bd
update en_US.po 2021-08-19 08:08:55 -04:00
Helmut K. C. Tessarek 2242cd2e4a
Update translations 2021-08-19 08:06:11 -04:00
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 0cec4753d8 Server: Fixes #5328: Filenames with non-ascii characters could not be downloaded from published note 2021-08-17 23:29:46 +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 be500f29cc Tools: Trying yet again to upgrade lock files to v2 2021-08-16 16:21:56 +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 bee6001462 Releasing sub-packages 2021-08-16 10:03:33 +01:00
Roman 6c18c6ddc7 Use url-parse 2021-08-15 13:48:32 +01:00
Roman 20d1f74ee4 Use enum 2021-08-14 23:30:19 +01:00
Roman 2386abea3e Rename parseUrl -> parseCallbackUrl 2021-08-14 23:18:58 +01:00
Roman ee46978389 Review comments - throw an error if callback url is not valid 2021-08-14 21:59:54 +01:00
Roman f0361bf80d Review comments - escape vars in url 2021-08-14 21:53:52 +01:00
Roman ecf718005d Code review comments 2021-08-14 21:01:03 +01:00
Roman f454c4e33b Add a function to check for valid callback url 2021-08-14 20:20:16 +01:00
Roman f118f5250f Handle openFolder and openTag too; change the URL format; extract ULR functions to a separate file 2021-08-14 13:33:45 +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 9c37a3e5e4 Setup new release 2.3 2021-08-12 16:49:37 +01:00
Laurent Cozic b5f148c33a Re-apply package-lock v2 2021-08-11 17:34:17 +01:00
Laurent Cozic 3a22674c03 Merge branch 'release-2.2' into dev 2021-08-11 16:42:22 +01:00
Laurent Cozic 34d6742563 Revert "Tools: Upgrade package locks to v2" 
Revert because it's been done in release-2.2 and too much of a mess to
fix the conflicts.

This reverts commit 94232b667d.
 2021-08-11 16:41:38 +01:00
Laurent Cozic 9ae2f07bd3 Releasing sub-packages 2021-08-11 16:29:31 +01:00
Laurent Cozic 15766d18f5 Cli: Fixed version command so that it does not require the keychain 2021-08-11 16:27:23 +01:00
Laurent Cozic a6030a40fa Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-11 16:26:01 +01:00
Laurent Cozic ca6d8ec1fa Cli: Fixed version command so that it does not require the keychain 2021-08-11 16:23:37 +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 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
Laurent Cozic 94232b667d Tools: Upgrade package locks to v2 2021-08-10 22:58:45 +01:00
Laurent Cozic 77cdd3467d Server: Resolves #5286: Set better filename and mime type for files downloaded via published notes 2021-08-10 19:13:16 +01:00
Laurent Cozic 6ed186a471 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-10 17:57:09 +01:00
Laurent Cozic 895dd813df Releasing sub-packages 2021-08-10 15:45:08 +01:00
Laurent Cozic b90ec3af1e Tools: Update version numbers of sub-packages 2021-08-10 15:41:54 +01:00
Laurent Cozic d6eedc88c5 Doc: Update Plugin API intro 2021-08-10 12:17:03 +01:00
Laurent Cozic f2351cbf32 Releasing sub-packages 2021-08-10 11:17:53 +01:00
Laurent Cozic 37ade59fca Releasing sub-packages 2021-08-10 11:12:36 +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
Alec 071e1649bc
All: Resolves #5244: Handles OneDrive throttling responses and sets User-Agent based on Microsoft best practices (#5246) 2021-08-08 18:38:04 +01:00
Laurent Cozic c3f10d31cb Chore: Convert E2EE related files to TypeScript 2021-08-07 12:22:37 +01:00
Laurent Cozic 3fb77c4e37 Tools: Trying to fix macOS tests on CI 2021-08-06 18:37:58 +01:00
Laurent Cozic e9d590169b Desktop: Remove template feature (replaced by template plugin) 2021-08-06 10:58:32 +01:00
Laurent Cozic d7d05f85ff Should wait when copying file 2021-08-05 15:08:57 +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 854b83039e Desktop: Fixes #5258: Fixed recipient list colors in Share Notebook dialog 2021-08-05 12:23:10 +01:00
Laurent Cozic 7f00e4ea5b Desktop: Turn old plugin deprecation notices into errors 2021-08-05 12:02:03 +01:00
Laurent Cozic f2547fed8d Server: Add support for Stripe yearly subscriptions 2021-07-31 14:42:56 +01:00
Laurent Cozic c76ed7f8ac Update translations 2021-07-28 13:35:40 +01:00
Laurent Cozic 361802273d Doc: Added sponsors and automatically build sponsor list on README 2021-07-26 18:21:19 +01:00
Helmut K. C. Tessarek d5fcffbac1
All: Translation: Update en_US.po 2021-07-25 19:18:01 -04:00
Helmut K. C. Tessarek 15edd4dfce
Update translations 2021-07-25 19:11:51 -04:00
Laurent Cozic 3a3aa701ac Desktop, Cli: Fixes #5232: Do not export share properties 2021-07-25 11:51:50 +01:00
Laurent Cozic e83ab93644 Server: Allow user to upgrade account 2021-07-23 20:34:30 +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 75cc73cc0c Desktop, Cli: Fixes #5213: Import highlighted text from ENEX files 2021-07-20 10:39:20 +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
Helmut K. C. Tessarek 62903874b5
Update translations 2021-07-16 14:18:48 -04:00
Roman Musin 7f709c210c
Remove unused condition in synchronizer (#5194) 2021-07-16 11:48:54 +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 67a000add9 Doc: Tweak welcome notes 2021-07-10 16:55:34 +01:00
Laurent Cozic f0c3a7313c Doc: Improved Welcome notes 2021-07-10 16:27:14 +01:00
Laurent 5214da0a44
Doc: Added new website front page and moved doc under /help (#5169) 2021-07-10 11:16:13 +01:00
Lee Matos 47b283a367
iOS: Fixed dark theme in iOS (#5165) 2021-07-09 10:44:35 +01:00
John Freeman 3430f0bcae
Plugins: Fix type of PostMessageHandler (#5138) 2021-07-06 14:00:51 +01:00
Laurent Cozic 0bc892e40e Setup version 2.2 2021-07-03 16:40:44 +01:00
Laurent Cozic 07ea79bb46 Desktop: Fixed issue where untitled notes where created after a note had been shared and synced 2021-07-02 18:17:08 +01:00
Laurent Cozic f792fbb5fc Desktop: Fixes #5133: Items keep being uploaded to Joplin Server after a note has been shared 2021-07-02 18:17:01 +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 6a5629391b Merge branch 'release-2.1' into dev 2021-06-27 15:29:35 +01:00
Laurent Cozic c3f4f22a2c Releasing sub-packages 2021-06-27 15:06:36 +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 3d03321328 All: Activate Joplin Server optimisations 2021-06-26 10:19:48 +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 51f3c0016e All, Server: Add support for X-API-MIN-VERSION header 2021-06-24 09:25:58 +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 0019bd147a Desktop, Cli: Fixes #4965: Handle special type of code block when importing ENEX files 2021-06-23 11:55:10 +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 67d9977489 Desktop, Clipper: Web Clipper now must request authorisation before accessing the application data 2021-06-22 19:57:04 +01:00
Laurent Cozic 7c92015fe6 Desktop: Fixes #4983: Fixed readability of links in notification banners 2021-06-21 19:30:20 +01:00
Laurent Cozic 0e757ad562 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-21 19:09:17 +01:00
Helmut K. C. Tessarek 5ecb870ffd
Update translations 2021-06-21 11:26:49 -04: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 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 112157e33f Server: Fixed handling of max item size for encrypted items 2021-06-20 16:29:35 +01:00