Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,817 Commits
255 Branches
1,362 Tags
662 MiB
Commit Graph

662 Commits (fix_publish_note)

Author SHA1 Message Date
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 8297d5a5c7 Tools: Fixed CLI tcp-port-used dependency 2021-12-18 16:25:59 +01:00
Laurent Cozic 2f1047e3eb Doc: Import Patreon posts 2021-12-17 15:35:26 +01:00
Laurent Cozic c0fd2274ee Releasing sub-packages 2021-12-17 13:02:09 +01:00
Laurent Cozic 1cb62d8357 Update translations 2021-12-17 01:16:46 +01:00
Laurent Cozic 4faba40b1e translations 2021-12-17 01:12:30 +01:00
Laurent Cozic d1508ce8f2 Update translations 2021-12-17 00:47:01 +01:00
Laurent Cozic c26ce462e8 Fix AWS string names 2021-12-17 00:45:00 +01:00
Laurent Cozic 4a1bc075ac Server: Display NTP server domain and port when there is an error, and display message when NTP check is skipped 2021-12-16 10:53:28 +01:00
Helmut K. C. Tessarek a4aa40dde8
Update translations 2021-12-14 17:44:19 -05:00
Helmut K. C. Tessarek c499473467
All: fixes #5801: Links in flowchart Mermaid diagrams (#5830) 2021-12-13 10:38:12 +00:00
Laurent Cozic e0e93c436b All: Fixed "Invalid lock client type" error when migrating sync target 2021-12-13 10:32:22 +01:00
Stephanos Komnenos a5b1255f45
Desktop: Allow flags for native wayland (#5804) 2021-12-01 13:51:42 +00:00
Laurent 6bbf053a4f
Tools: Run Joplin Server Postgres tests on CI (#5807) 2021-11-30 15:37:07 +00:00
Laurent Cozic 7eb1d89d66 Server: Retry NTP request up to three times when it fails 2021-11-29 10:17:12 +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
Laurent Cozic 82defbdd7b Chore: Fixed mobile build 2021-11-23 12:12:27 +00:00
Laurent Cozic c19e59f5da Cli: Ask for master password when encryption or decryption fails 2021-11-22 17:57:02 +00:00
Laurent Cozic 0e11273c45 Desktop: Fixes #5693: Opening a file with ctrl and click leads to an error in the Rich Text editor 2021-11-22 17:20:48 +00:00
Laurent Cozic bffd181f51 Tools: Fixed Android build 2021-11-21 16:38:56 +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 42c32c13e7 Update website 2021-11-19 13:06:17 +00:00
Laurent Cozic e8894d486e Tools: Fixed tests 2021-11-19 12:56:39 +00:00
Laurent Cozic a03ef8d18a Tools: Fixed tests 2021-11-19 12:16:07 +00:00
Laurent Cozic 0ec0d87e71 All: Resolves #5754: Improved error message when synchronising with Joplin Server 2021-11-19 11:26:01 +00:00
Laurent Cozic 98ed2be518 Desktop, CLI: When exporting as HTML, pack all images, styles and scripts inside the HTML file 2021-11-18 15:08:13 +00:00
Laurent Cozic 0bf323dc63 Server: Resolves #5738: Check for time drift when the server starts 2021-11-17 18:41:25 +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
Laurent Cozic 567ba06b55 Desktop: Improved error message when a file cannot be uploaded or downloaded 2021-11-14 16:50:23 +00:00
Helmut K. C. Tessarek b58ea0f202
Desktop: Add shortcut for bulleted list (#5698) 
Ref: https://discourse.joplinapp.org/t/shortcut-for-lists/21646
 2021-11-11 15:50:15 +00:00
Kenichi Kobayashi f495db1391
Desktop: Sort Order Buttons and Per-Notebook Sort Order (#5437) 2021-11-11 15:33:37 +00:00
Laurent Cozic 725c79d1ec Desktop: Fixed button to upgrade a master key 2021-11-10 15:40:32 +00:00
Laurent Cozic 0de6e9ed11 All: Fixed issue that could cause application to needlessly lock the sync target 2021-11-10 14:47:26 +00:00
Laurent Cozic 4deeed0d5c Desktop, Mobile: Fixes #5687: Fixed issue with parts of HTML notes not being displayed in some cases 2021-11-09 18:33:28 +00:00
Laurent Cozic f8d9601ff7 Tools: Restored HTML to ENEX tests that had been deleted in a refactoring 2021-11-09 17:49:05 +00:00
Laurent Cozic 89179c2776 Desktop, Cli: Add support for more style of highlighted texts when importing ENEX files 2021-11-09 16:42:50 +00:00
agerardin 6b31609338
Plugins: Allow posting messages from plugin to webview (#5569) 2021-11-09 15:50:50 +00:00
Laurent Cozic 7b3ad32103 Update translations 2021-11-09 15:28:38 +00:00
Laurent Cozic 920f2d9655 Revert "Update translations" 
This reverts commit f800ca0269.

Reverting for now due to some translations being incorrectly marked as
fuzzy.
 2021-11-09 13:49:20 +00:00
Laurent Cozic f800ca0269 Update translations 2021-11-09 13:16:09 +00:00
Helmut K. C. Tessarek b328094033
update en_US.po 2021-11-08 10:30:18 -05:00
Helmut K. C. Tessarek 4f0f1af5d1
Update translations 2021-11-08 10:22:16 -05:00
Laurent Cozic c4017e52dc Fixed a few strings 2021-11-08 10:00:11 +00:00
Laurent Cozic 3e5ad0a374 Desktop, Cli: Fixes #5653: Long resource filenames were being incorrectly cut 2021-11-07 16:41:39 +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 e6d3396f42 lock files 2021-11-03 12:54:08 +00:00
Laurent 47a31c4ef1
All, Server: Add support for faster built-in sync locks (#5662) 2021-11-03 12:26:26 +00:00
Laurent Cozic 5892a0678b Releasing sub-packages 2021-11-03 11:18:03 +00:00
Laurent Cozic 74fcd474af Releasing sub-packages 2021-11-03 11:10:06 +00:00
Laurent Cozic bcd568a496 Setup new release 2.6 2021-11-02 20:07:13 +00:00
Laurent Cozic c5569ef06d All: Fixed potential infinite loop when Joplin Server session is invalid 2021-10-31 18:33:06 +00:00
Laurent Cozic 401f1b1f83 Tools: Fixed tests when using Joplin Server as sync target 2021-10-31 18:31:40 +00:00
Laurent Cozic bb06e56a05 Added better-sqlite database driver, although we cannot use it for now 2021-10-29 18:48:13 +01:00
Laurent Cozic e247be1fa7 Desktop: Fixed default migration logic 2021-10-28 22:26:23 +01:00
Laurent Cozic 33249ca05a All: Improved handling of expired sessions when using Joplin Server 2021-10-25 19:46:45 +01:00
Laurent Cozic ace1118cf1 All: Improved handling of expired sessions when using Joplin Server 2021-10-25 17:49:38 +01:00
Laurent Cozic 72c12354dc All: Improved Joplin Server configuration check to better handle disabled accounts 2021-10-24 14:08:55 +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 7d62df8906 Desktop: Improved master password state handling in Encryption screen 2021-10-17 19:10:37 +01:00
Laurent Cozic 1406d97b3e Mobile: Fixes #5585: Fixed logic of setting master password in Encryption screen 2021-10-17 17:20:59 +01:00
Laurent Cozic a5560a6652 Fixed mobile package 2021-10-17 16:13:12 +01:00
Laurent Cozic 21a7149493 Fixed mobile build 2021-10-17 14:54:48 +01:00
Laurent Cozic 6bcd801028 Fixed interface 2021-10-16 12:20:04 +01:00
Kingsley Yung 5e6e1bf913
Cli: Fixes #5341: Ignore newline between quotes while spliting batch (#5540) 2021-10-16 12:19:53 +01:00
Roman Musin 6879481fd5
Desktop: Resolves #5168: Add support for callback URLs (#5416) 2021-10-16 10:07:41 +01:00
Caleb John 2acd55eb81
Desktop, Cli: Resolves #5224: Add Markdown + Front Matter exporter/importer (#5465) 2021-10-16 09:59:37 +01:00
Laurent Cozic 8a7fa78c54 Chore: Moved share invitation response logic to separate file (Desktop) 2021-10-15 16:16:02 +01:00
Laurent Cozic a5f2fd8982 Chore: Linter 2021-10-15 12:39:08 +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 dcbe853cd8 Desktop, Cli: Fixes #5543: Fixed running out of memory when importing large ENEX files 2021-10-13 10:55:39 +01:00
Laurent Cozic 23996e0efe Desktop: Fixes #5421: Exclude disabled commands from Goto Anything 2021-10-05 18:09:09 +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
Helmut K. C. Tessarek 349f8c8256
Update translations 2021-10-02 06:00:03 -04:00
Laurent Cozic 4a7746beb2 Desktop: Upgrade Electron from v10 to v14 2021-10-01 19:35:27 +01:00
Laurent Cozic 0d3ecffed9 Merge branch 'release-2.4' into dev 2021-09-29 20:11:40 +01:00
Laurent Cozic 4b39d30255 All: Fix default sync target 2021-09-29 19:27:26 +01:00
Laurent Cozic 6a22fb51f3 Setup new release 2.5 2021-09-29 16:45:06 +01:00
Laurent Cozic eceb517128 Update website 2021-09-29 16:30:33 +01:00
Laurent Cozic c831c7bf6f Releasing sub-packages 2021-09-29 16:23:56 +01:00
Laurent Cozic c7cc5cc1a9 publish 2021-09-29 16:22:20 +01:00
Laurent Cozic eb4b0e64ea Releasing sub-packages 2021-09-29 16:16:40 +01:00
Laurent Cozic b1d0c15210 Desktop, Cli: Make exported HTML more readable on mobile 2021-09-26 12:01:46 +01:00
Laurent Cozic 9f17b28f85 Chore: Cleaned up server UserItem interface 2021-09-25 19:51:44 +01:00
Laurent Cozic 8ada059401 Desktop: Improved accepting a folder share 2021-09-25 18:00:43 +01:00
Laurent Cozic f144daed96 Desktop, Cli: Allow importing certain corrupted ENEX files 2021-09-23 15:35:49 +01:00
Laurent Cozic 62f81b4315 Chore: Converts ENEX import file to TypeScript 2021-09-23 13:16:22 +01:00
Laurent Cozic 31b6d06418 lock files 2021-09-22 17:38:35 +01:00
Laurent Cozic 56cac1f729 Desktop: Fixes #5161: Improved plugin search and installing new plugins from China 2021-09-21 16:22:58 +01:00
Laurent Cozic 0cbc261051 Chore: Remove last remnants of discontinued Nextcloud App 2021-09-19 19:15:10 +01:00
Helmut K. C. Tessarek 56be4d59f4
Update translations 2021-09-19 08:37:08 -04:00
Laurent Cozic e447acc076 Desktop: Resolves #5440: Do not escape content when copying from Rich Text editor 2021-09-19 13:00:06 +01:00
Marph 2d72d1435e
Desktop: Support for user-data-dir flag (#5467) 
This flag is passed by chromedriver.
 2021-09-19 11:34:04 +01:00
JackGruber afe1cf747d
All: Fixes #5444: Misinterpreted search term after filter in quotation marks (#5445) 2021-09-19 11:31:38 +01:00
Laurent Cozic 43c594b6b2 Server, Desktop: Sync deleted items first to allow fixing oversized accounts 2021-09-18 15:02:24 +01:00
Laurent Cozic b56177a4e3 Tools: Added tools to stress test Joplin Server 2021-09-17 10:59:10 +01:00
Laurent Cozic 20f8743079 Tools: Upgrade back package-lock files to v2 2021-09-12 16:34:03 +01:00
Kenichi Kobayashi 6c43b78496
All: Fixes #5447: Plugin onNoteSelectionChange() is triggered twice after a search (#5449) 2021-09-12 11:40:14 +01:00
Helmut K. C. Tessarek 9d5d891fe3
Desktop, Mobile: Resolves #5295: Update Mermaid 8.10.2 -> 8.12.1 and fix gitGraph crash (#5448) 2021-09-11 19:47:01 +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 a2c6461af8 Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 19:24:52 +01:00
Laurent Cozic d33b99cffb Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 18:46:58 +01:00
Laurent Cozic 9260b2a9ab Plugins: Add support for enabledConditions when creating menu item from command 2021-09-09 14:44:16 +01:00
Laurent Cozic 9407efd8ec All: Allow disabling any master key, including default or active one 
Ref: https://discourse.joplinapp.org/t/syncing-error-with-joplin-cloud-and-e2ee-master-key-is-not-loaded/20115/5
 2021-09-06 18:33:17 +01:00
Laurent Cozic 8996a0159a Lock file and TS error 2021-09-06 17:05:27 +01:00
Laurent Cozic 478d4accf1 Desktop: Load themes as CSS variables for use in custom themes and internal components 2021-09-06 16:57:07 +01:00
Laurent Cozic f5891dfae8 Tools: Fixed build 2021-09-04 15:15:25 +01:00
Laurent Cozic 736bbbd8ed Plugins: Fixed import API 
Ref: https://discourse.joplinapp.org/t/prompt-when-the-plugin-is-running-typeerror-this-module-oninit-is-not-a-function/20009/14
 2021-09-04 15:07:38 +01:00
Laurent Cozic c529b972e3 Chore: Automatically create command index for desktop app 2021-09-04 13:43:25 +01:00
Laurent Cozic f371bb8e59 Revert "Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev" 
This reverts commit 7c85889c1f, reversing
changes made to ab134807ea.

Reason: Messed up and accidentally merged a pull request.
 2021-09-03 15:03:17 +01:00
Laurent Cozic 7c85889c1f Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev 2021-09-03 15:00:31 +01:00
Laurent Cozic 0793b1be59 Releasing sub-packages 2021-09-02 18:40:37 +01:00
Roman 1a703c4ecd Rename ProtocolUtils -> callbackUrlUtils 2021-09-01 22:28:33 +01:00
Roman 1126899769 Code review changes 2021-09-01 22:27:24 +01:00
Laurent Cozic d97ba57dda Desktop: Sort plugin results according to recommended property, and display Recommended tag 2021-09-01 12:17:20 +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
Helmut K. C. Tessarek 0a98854e43
Update translations 2021-08-28 11:50:02 -04:00
Laurent Cozic dec0a08954 Desktop, Mobile: Fixes #5391: Fixed crash when a required master key does not exist 2021-08-28 15:36:05 +01:00
Laurent Cozic f19c4ab434 Desktop: Allow specific deprecated plugins to still work 2021-08-27 16:34:39 +01:00
Laurent Cozic 70efaddeaf All: Do not display master key upgrade warnings for new master keys 2021-08-27 11:30:21 +01:00
Laurent Cozic 814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +01:00
Caleb John 4ba417a2f4
Desktop: Various improvements to Markdown import and export (#5290) 
In preparation for #5224
 2021-08-23 00:35:45 +01:00
Laurent Cozic 50f421c5d9 Tools: Setup release 2.4 2021-08-21 10:46:46 +01:00
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