Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,432 Commits
253 Branches
1,362 Tags
664 MiB
Commit Graph

1222 Commits (dev_no_template)

Author SHA1 Message Date
Laurent Cozic b0e9b0e042 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-03 15:27:14 +01:00
Laurent Cozic a53a6e6f15 Merge branch 'release-2.1' into dev 2021-07-03 09:35:01 +01:00
Laurent Cozic e08a909bdb Android release v2.1.4 2021-07-03 09:31:15 +01:00
Laurent Cozic bfa7ea7871 Server: Moved Joplin-specific context properties under its own namespace 2021-07-02 18:53:45 +01:00
Laurent Cozic 94ea177b76 Desktop release v2.1.8 2021-07-02 18:17:37 +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
Gen Neko 5ee2ffe174
All: Translation: Update ja_JP.po (#5132) 2021-06-30 16:14:33 -04:00
小骏 1209cc6872
All: Translation: Update zh_CN.po (#5128) 
* update zh_CN.po

* update zh_CN.po

* update zh_CN.po
 2021-06-28 14:24:36 -04:00
Laurent Cozic ac800af9f8 Merge branch 'release-2.1' into dev 2021-06-28 13:22:18 +01:00
Laurent Cozic 7ed1a453e5 Clipper release v2.1.2 2021-06-28 11:40:53 +01:00
Laurent Cozic 55248ed08b Clipper: Fixed auth mechanism when extension popup is closed before process is finished 2021-06-28 11:39:31 +01:00
Laurent Cozic d5becfa0ae Merge branch 'release-2.1' into dev 2021-06-27 16:55:50 +01:00
Laurent Cozic 1476cdf467 CLI v2.1.2 2021-06-27 16:52:03 +01:00
Laurent Cozic 6a5629391b Merge branch 'release-2.1' into dev 2021-06-27 15:29:35 +01:00
Laurent Cozic b77f9388b0 CLI v2.1.1 2021-06-27 15:08:54 +01:00
Laurent Cozic c3f4f22a2c Releasing sub-packages 2021-06-27 15:06:36 +01:00
Laurent Cozic c9f7d6483f Clipper release v2.1.1 2021-06-27 14:56:04 +01:00
Laurent Cozic de9d7f747f ios-v12.1.1 2021-06-27 14:43:07 +01:00
Laurent Cozic a04e7b7d8d Android release v2.1.3 2021-06-27 14:33:22 +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 04c4015c85 Desktop release v2.1.7 2021-06-26 10:20:22 +01:00
Laurent Cozic 3d03321328 All: Activate Joplin Server optimisations 2021-06-26 10:19:48 +01:00
Laurent Cozic 78f001eb9d Desktop release v2.1.6 2021-06-26 09:13:18 +01:00
Nishant Mittal d13d5b4cc3
Desktop: Remove templates feature (#5115) 2021-06-25 17:49:36 +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
Roman Musin 5047cf1027
Android: Disable backup to Google Drive (#5114) 
Ref: https://discourse.joplinapp.org/t/cant-do-a-clean-re-install-on-android-using-joplin-cloud
 2021-06-24 13:24:03 +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 65d87220de Server v2.1.6 2021-06-24 11:01:59 +01:00
Laurent Cozic f86879778b Server: Fixed accessing main website (Regression) 2021-06-24 11:00:31 +01:00
Laurent Cozic 5390e100e6 Server v2.1.5 2021-06-24 09:26:53 +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 752d118e5d lock file 2021-06-24 08:59:05 +01:00
Laurent Cozic c2cd1733cc Server v2.1.4 2021-06-24 08:26:20 +01:00
Deun Lee fe83491eab
All: Translation: Update ko.po (#5112) 2021-06-23 12:37:11 -04:00
Laurent Cozic 6cbdad0690 Tools: Exit with error code 1 when macOS notarization fails 2021-06-23 15:27:06 +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 b92ab2b8cc Desktop release v2.1.5 2021-06-23 14:01:15 +01:00
Laurent Cozic e9f5ca817b Desktop: Resolves #4905: Apply monospace font to code dialog in Rich Text editor 2021-06-23 12:35:37 +01:00
Laurent Cozic dc9bb26c1a Clipper: Resolves #4785: Updated Readability library to v0.4.1 2021-06-23 12:16:07 +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 46868e6b25 Desktop release v2.1.4 2021-06-22 19:57: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 8e712eacf5 Fixed tsc build 2021-06-21 21:32:05 +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
Laurent Cozic 0c12c7f811 Server: Split permission to share note or folder 2021-06-21 19:06:44 +01:00
Helmut K. C. Tessarek 5ecb870ffd
Update translations 2021-06-21 11:26:49 -04:00
Helmut K. C. Tessarek e58e2a3421
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-06-21 11:21:41 -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 65e9268e83 Mobile: Fixed version number on config screen 2021-06-21 08:55:02 +01:00
Laurent Cozic 5ef5888bfb Android release v2.1.2 2021-06-20 19:35:28 +01:00
Laurent Cozic 12aae48ce6 Server: Fixed transaction locking issue when a sub-transaction fails 2021-06-20 19:30:33 +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 9323caf2f1 Fixed revision issue for old revisions 2021-06-20 13:59:58 +01:00
Laurent Cozic d13b1f96ba fixed tests 2021-06-20 13:46:50 +01:00
Laurent Cozic 8e55fe31ee fix tests 2021-06-20 12:30:45 +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 8a2ca0535d Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-20 11:20:51 +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
Longhao.Chen 11ffbe7d66
Update zh_CN.po (#5101) 2021-06-20 09:50:43 +01:00
Laurent Cozic 8cc103a062 Android release v2.1.1 2021-06-19 17:42:08 +01:00
Laurent Cozic 7f05efb789 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-19 17:35:19 +01:00
Laurent Cozic 5b368e39ca Mobile: Allow enabling and disabling feature flags 2021-06-19 17:32:36 +01:00
Laurent Cozic b88bbc74a2 Desktop release v2.1.3 2021-06-19 16:26:39 +01:00
Laurent Cozic fc132216cb Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-19 16:25:53 +01:00
Laurent Cozic 1dc49c7673 Desktop release v2.1.2 2021-06-19 16:25:19 +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 b7b12f9369 Server v2.1.3 2021-06-19 15:15:25 +01:00
Laurent Cozic d8752ab889 Tools: Fixed Docker image tagging for pre-releases 2021-06-19 15:14:19 +01:00
Laurent Cozic 372495afd3 Desktop release v2.1.1 2021-06-19 14:28:27 +01:00
Laurent Cozic 2320934853 Server v2.1.2 2021-06-19 14:25:15 +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 7aff6d271d Cli: Added flag to disable local lock when synchronising 2021-06-19 11:41:36 +01:00
Laurent Cozic a86a80b21c Fixed column type for Postgres 2021-06-19 11:05:06 +01:00
Laurent Cozic 4dc1210eb5 All: Improved first sync speed when synchronising with Joplin Server 2021-06-19 10:34:44 +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 63f7349c17 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-18 17:15:01 +01:00
Laurent Cozic 3b9c02e92d Server: Add support for uploading multiple items in one request 2021-06-18 11:50:06 +01:00
Helmut K. C. Tessarek cef5834d73
All: Update Mermaid: 8.8.4 -> 8.10.2 (#5092) 2021-06-18 08:53:16 +01:00
Francisco Mora b341caf287
All: Translation: Update es_ES.po (#5096) 2021-06-17 22:15:48 -04:00
小骏 fc063fe68e
All: Translation: Update zh_CN.po (#5079) 
* update zh_CN.po

* update zh_CN.po
 2021-06-17 20:36:11 +01:00
Laurent Cozic d73eab6f82 Fixed tests 2021-06-17 18:32:52 +01:00
Laurent Cozic d698ea0c12 Server v2.1.1 2021-06-17 18:27:54 +01:00
Laurent Cozic e04133cfc6 Setup new release 2.1 2021-06-17 18:26:58 +01:00
Laurent Cozic 525ab01b9b Mobile: Add version number to log 2021-06-17 18:19:32 +01:00
Laurent Cozic 0d33955fcd All: Mask auth token and password in log 2021-06-17 18:17:23 +01:00
Laurent Cozic 7f0b3fd718 Server: Added account info to dashboard and title to pages 2021-06-17 18:04:35 +01:00
Laurent Cozic 65c3d01cc6 Server: Sort users by name, then email 2021-06-17 17:34:17 +01:00
Laurent Cozic ac03c08f33 Server: Hide Reset Password button when creating new users 2021-06-17 17:30:45 +01:00
Laurent Cozic ea1d614f82 Tools: Utility to measure perforemances 2021-06-17 17:27:03 +01:00
Laurent Cozic c682c8879c Server: Added way to batch requests (currently disabled) 2021-06-17 16:55:45 +01:00
Laurent Cozic e8532441bc Server: Added way to debug slow queries 2021-06-17 16:51: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 a38958ab7b Tools: Added scripts to test server performances 2021-06-17 11:21:37 +01:00
Laurent Cozic 232e0c937a Server v2.0.14 2021-06-17 09:52:40 +01:00
Laurent Cozic 479237d16f Server: Allow sending reset password email from admin UI 2021-06-17 09:49:56 +01:00
Laurent Cozic 6ae0e84a1a Server: Tokens would expire too soon 2021-06-17 09:28:45 +01:00
Laurent Cozic 71d567669b CLI v2.0.1 2021-06-16 20:07:17 +01:00
Laurent Cozic db39db45c5 Releasing sub-packages 2021-06-16 20:04:45 +01:00
Laurent Cozic 6916b53c2e Plugin Generator release v2.0.1 2021-06-16 20:02:14 +01:00
Laurent Cozic 578550e824 Plugins: Updated types 2021-06-16 20:01:32 +01:00
Laurent Cozic 981b1d845c Desktop release v2.0.11 2021-06-16 18:22:59 +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 8c56cf98be Server v2.0.13 2021-06-16 15:28:41 +01:00
Laurent Cozic 18965494d9 Server: Allow creating a new user with no password, which must be set via email confirmation 2021-06-16 15:24:15 +01:00
Laurent Cozic ecd1602658 Server: Allow creating a user with a specific account type from admin UI 2021-06-16 15:02:26 +01:00
Laurent Cozic 3c181906c2 Server: Fixed issue with user not being able to modify own profile 2021-06-16 14:34:58 +01:00
Laurent Cozic 757c125bd3 Android release v2.0.4 2021-06-16 13:15:09 +01:00
Laurent Cozic 2867b66cf1 Tools: Fixed tests 2021-06-16 13:10:42 +01:00
Laurent Cozic 5c6fd93753 All: Prevent sync process from being stuck when the download state of a resource is invalid 2021-06-16 13:03:10 +01:00
Laurent Cozic ea65313bdb Server: Fixed error message when item is over the limit 2021-06-16 11:07:21 +01:00
Laurent Cozic e0b5ef6630 Android release v2.0.3 2021-06-16 10:48:10 +01:00
Laurent Cozic 4bbb3d1d58 Android: Verbose mode for synchronizer 2021-06-16 10:43:39 +01:00
Laurent Cozic fd769945b1 ios-v12.0.2 2021-06-16 09:26:21 +01:00
Laurent Cozic 6e91d2784f Tools: Fixed iOS versions 2021-06-16 09:26:10 +01:00
Laurent Cozic 881b2f17b1 ios-v20.0.1 2021-06-16 09:06:37 +01:00
Laurent Cozic e83cc58ea6 Tools: Fix iOS version number 2021-06-16 09:04:41 +01:00
Laurent Cozic 77def9f782 Tools: Publish full changelog for Android app 2021-06-15 21:08:55 +01:00
Laurent Cozic d8119bcf07 Android release v2.0.2 2021-06-15 21:02:32 +01:00
Laurent Cozic 8bce259dc9 Desktop release v2.0.10 2021-06-15 20:56:38 +01:00
Laurent Cozic 8a00eef901 Server v2.0.12 2021-06-15 17:24:56 +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 c5b0529968 Cli: Allow setting up E2EE without having to confirm the password 2021-06-15 17:15:00 +01:00
Laurent Cozic ba322b1f9b Tools: Only notarize macOS app when building a desktop app tag 2021-06-15 16:05:26 +01:00
Laurent Cozic 6f27eae7dd Server v2.0.11 2021-06-15 12:41:59 +01:00
Laurent Cozic 85cc08c0d4 typo 2021-06-15 12:41:15 +01:00
Laurent Cozic ba38bf3490 Server v2.0.10 2021-06-15 12:28:05 +01:00
Laurent Cozic 2cf70675dc All: Fixed user content URLs when sharing note via Joplin Server 2021-06-15 12:25:55 +01:00
Laurent Cozic 58f8d7e1b4 Merge branch 'dev' into release-2.0 2021-06-15 11:53:51 +01:00
Helmut K. C. Tessarek b55b35e53f
Update translations 2021-06-14 11:38:21 -04:00
Michal Stanke c7194bf243
All: Translation: Update cs_CZ.po (#5074) 2021-06-14 10:55:23 -04:00
milotype 48abe2316e
All: Translation: Update hr_HR.po (#5073) 2021-06-13 18:02:08 -04:00
Laurent Cozic 7aca380cfa Desktop release v2.0.9 2021-06-12 10:00:27 +02:00
Laurent Cozic 551033f8ba Merge branch 'dev' into release-2.0 2021-06-12 10:00:04 +02: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 1aa70dd6b4 Generator: Include JSON files in webpack config 2021-06-12 00:18:33 +02:00
Laurent Cozic feaecf7653 Desktop, Mobile: Filter out form elements from note body to prevent potential XSS (thanks to Dmytro Vdovychinskiy for the PoC) 2021-06-11 20:17:45 +02:00
Laurent Cozic af9f3eedd3 Server v2.0.9 2021-06-11 18:49:29 +02:00
Laurent Cozic 815800827b Tools: Fixed Docker image version number 2021-06-11 18:34:16 +02:00
Laurent Cozic 8f1e3ba43c Server v2.0.8 2021-06-11 18:29:40 +02:00
Laurent Cozic 8459b46cd0 Tools: Allow building Docker image from CI 2021-06-11 18:24:59 +02:00
Nishant Mittal c5c38a323f
Desktop: Expose prompt to plugins as a command (#5058) 2021-06-11 00:26:16 +01:00
JackGruber 01e6ca4616
All: Fixes: Wrong field removed in API search (#5066) 2021-06-11 00:24:50 +01:00
Laurent Cozic 24a586c537 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-11 01:23:45 +02:00
Laurent Cozic 5d233a7387 Tools: Fixed tests 2021-06-11 01:15:43 +02:00
Helmut K. C. Tessarek 054e5428d5
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-06-10 19:06:15 -04:00
Laurent Cozic a36b13dcb4 Server: Handle custom user content URLs 2021-06-10 19:33:04 +02:00
Laurent Cozic b81c300907 Desktop release v2.0.8 2021-06-10 17:43:30 +02:00
Laurent Cozic 315216132f Desktop release v2.0.7 2021-06-10 17:04:09 +02:00
Laurent Cozic 2eaa821272 Merge branch 'dev' into release-2.0 2021-06-10 17:03:29 +02:00
Laurent Cozic 7c93e268e4 Tools: Fixed CI for macOS build 2021-06-10 17:02:52 +02:00
Laurent Cozic d0c4de92e2 Desktop release v2.0.6 2021-06-10 14:07:12 +02:00
Laurent Cozic 91ce465535 Desktop release v2.0.5 2021-06-10 14:06:09 +02:00
Laurent Cozic 4098c01e7c Merge branch 'dev' into release-2.0 2021-06-10 14:03:50 +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 00dc1d881b Desktop: Allow passing arguments to commands in command palette 2021-06-10 11:46:41 +02:00
Laurent Cozic c37eb56ed7 Tools: Fixed tests 2021-06-10 11:13:00 +02: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 0e4c545e14 Tools: Fixed tests 2021-06-10 10:57:45 +02:00
Laurent Cozic bbae1aef28 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-10 00:11:40 +02:00
Laurent Cozic cf86ffc36e Plugin Repo: Update stats every 7 days 2021-06-10 00:11:11 +02:00
Roman Musin 9d80a79cda
Android: Resolves #4216: Focus note editor where tapped instead of scrolling to the end (#4998) 2021-06-08 23:39:20 +01: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 75b66a9fff Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-08 20:38:05 +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
Subhra264 ce02a30441
Desktop, Mobile: Fixes #5025: Inline Katex gets broken when editing in Rich Text editor (#5052) 2021-06-08 19:23:10 +01: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 594084e274 Server: Fixed error when creating user 2021-06-08 12:39:18 +02:00
Laurent Cozic 5614eb9442 Server: Added option to enable or disable stack traces 2021-06-08 12:08:40 +02:00
Laurent Cozic 7a3a2084db Server: Add navbar on login and sign up page 2021-06-08 11:48:58 +02:00
Laurent Cozic 95d7ccccea Desktop: Improved Joplin Server error handling 2021-06-08 01:34:33 +02:00
Laurent Cozic f7a7009b3c Server v2.0.6 2021-06-07 19:28:18 +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 c8d7ecbf6c Server: Add request duration to log 2021-06-07 16:27:09 +02:00
Laurent Cozic 3c41b45e8e Server: Check share ID when uploading a note 2021-06-07 16:17:52 +02:00
mbalint 62a371b9f3
All: Resolves #4613: Improve search with Asian scripts (#5018) 2021-06-07 15:15:04 +01:00
Laurent Cozic 5528ab7cc8 Tools: Fixed tests 2021-06-07 15:46:35 +02:00
JackGruber dd1c9e3c2a
All: Fixes #5007: Items are filtered in the API search (#5017) 2021-06-07 10:21:24 +01:00
Roman Musin 7c45b95f6f
Desktop: recreate http agent when the protocol changes (#5016) 2021-06-07 10:19:59 +01:00
Caleb John a7e67952b8
Plugins: Support executing codemirror commands from plugins when using execCommand (#5012) 2021-06-07 10:19:35 +01:00
Austin Doupnik 1b7d40387d
Desktop: Fixes #4877: Incorrect list renumbering (#4914) 2021-06-07 10:17:46 +01:00
Helmut K. C. Tessarek 7921e70c4f
macOS: add 'Hide Others' and 'Show All' menu items (#5024) 2021-06-06 23:49:44 +01:00
Laurent Cozic 23cfbc2367 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-06 19:14:48 +02:00
Laurent Cozic de45740129 Server: Load shared user content from correct domain 2021-06-06 19:14:12 +02:00
Helmut K. C. Tessarek a04d8ef441
Doc: fix text of terms and privacy (#5053) 2021-06-05 08:26:32 +01:00
Laurent Cozic db7b802803 Server: Add terms and privacy page 2021-06-04 18:09:09 +02:00
Laurent Cozic 75d79f373a Server: Added way to disable signup page, and added links between signup and login pages 2021-06-04 17:08:21 +02:00
Laurent Cozic e8a02c26d0 Desktop: Fixed: Ctrl+Clicking links in Rich Text editor was broken (regression) 2021-06-04 13:34:30 +02:00
Laurent Cozic 147b6b13ab package locks 2021-06-04 13:19:04 +02:00
Helmut K. C. Tessarek a496a3d90d
update en_US.po 2021-06-04 00:38:54 -04:00
Helmut K. C. Tessarek 69a8ada2ec
add new translation strings 2021-06-04 00:34:19 -04:00