Compare commits

...
Author SHA1 Message Date
Laurent Cozic b490537c26 Publish
- joplin@2.2.2
 - @joplin/app-clipper@1.0.9
 - @joplin/app-desktop@2.2.7
 - @joplin/app-mobile@0.8.10
 - @joplin/fork-htmlparser2@4.1.31
 - @joplin/fork-sax@1.2.35
 - generator-joplin@2.2.2
 - @joplin/lib@2.2.3
 - @joplin/plugin-repo-cli@2.2.3
 - @joplin/plugins@0.0.1
 - @joplin/renderer@2.2.3
 - @joplin/server@2.2.12
 - @joplin/tools@2.2.3
 - @joplin/turndown-plugin-gfm@1.0.35
 - @joplin/turndown@4.0.53
2021-08-10 15:09:17 +01:00
Laurent Cozic c3263a132f ios-v12.2.1 2021-08-10 11:56:58 +01:00
Laurent Cozic eef6530c95 Plugin Generator release v2.2.1 2021-08-10 11:35:34 +01:00
Laurent Cozic bac0d68156 Plugins: Updated types 2021-08-10 11:34:49 +01:00
Laurent Cozic 97349ceb6a CLI v2.2.1 2021-08-10 11:21:37 +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
Laurent Cozic 212dacdfbe Android 2.2.3 2021-08-09 19:49:05 +01:00
Laurent Cozic 34d3e8f027 Android release v2.2.3 2021-08-09 19:35:43 +01:00
Laurent Cozic 2d7c8c599a Android 2.2.2 2021-08-09 19:28:58 +01:00
Laurent Cozic 70c1e7ae28 Android release v2.2.2 2021-08-09 19:15:42 +01:00
Laurent Cozic 60aca7beec Desktop release v2.2.6 2021-08-09 19:06:07 +01:00
Laurent Cozic 8589f39afe Merge branch 'dev' into release-2.2 2021-08-09 19:05:46 +01:00
Laurent Cozic 6632d67a64 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-09 19:05:00 +01:00
Ahmad Mamdouh e7260d7498 Plugins: Hide note list menu items for commands that are disabled (#5270) 2021-08-09 19:04:40 +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 f14c74d802 Server: Disable upload for accounts with subscription failed payments 2021-08-09 19:00:22 +01:00
Laurent Cozic 391204c31e Server: Allow setting email key to prevent the same email to be sent multiple times 2021-08-09 16:55:04 +01:00
Laurent Cozic b3cec3be37 Update website 2021-08-09 14:15:17 +01:00
Laurent Cozic d2afd9980c Update website 2021-08-09 13:19:08 +01:00
Laurent Cozic 96c7a18d5b Doc: Update image links 2021-08-09 13:17:58 +01:00
Laurent Cozic dfcafd8254 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-09 13:17:34 +01:00
Helmut K. C. Tessarek 6a17f717cf Doc: remove brew install method 2021-08-09 07:46:03 -04:00
Laurent Cozic fdd77b8e88 Doc: Fixed blockquote style 2021-08-09 11:57:34 +01:00
Laurent Cozic 41f4e037b5 Doc: Added doc for publishing note 2021-08-09 11:56:48 +01:00
Laurent Cozic 7061d6c05d Doc: Add Share Notebook doc 2021-08-09 11:48:29 +01:00
Lee Matos f90885709c Mobile: Resolves #4588: Make sync icon spin in the right direction (#5275) 2021-08-08 18:41:28 +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 f9cfefdb29 Desktop: Resolves #5273: Prevent plugins from crashing the application 2021-08-06 13:08:32 +01:00
Laurent Cozic 153216c236 Desktop release v2.2.5 2021-08-06 11:05:10 +01:00
Laurent Cozic 517deade20 Merge branch 'dev' into release-2.2 2021-08-06 11:04:59 +01:00
Laurent Cozic e9d590169b Desktop: Remove template feature (replaced by template plugin) 2021-08-06 10:58:32 +01:00
Abhinav Sharma b0609319fd Doc: add mobile UI infographic to readme/mobile.md (#5252)
* Update mobile.md

Add mobile interface

* Update mobile.md

* Add joplin_mobile_ui.jpg

* Delete file

* Add JoplinMobileUI

* Delete file

* Add JoplinMobileUI

* Update mobile.md

* Add JoplinMobileUI.jpg

* Update mobile.md

* Delete Assets/JoplinMobileui.jpg

* Add JoplinMobileUI.jpg

* Update mobile.md

* Delete JoplinMobileUI.jpg
2021-08-05 18:18:27 -04:00
Laurent Cozic fa9c08be06 Plugin Repo: Added plugin download links on README page 2021-08-05 17:32:00 +01:00
Laurent Cozic daadc3309b Desktop release v2.2.4 2021-08-05 16:04:42 +01:00
Laurent Cozic dbe7146bdd Merge branch 'dev' into release-2.2 2021-08-05 16:04:28 +01:00
Laurent Cozic b3ce5fbc48 Doc: Added debug info 2021-08-05 16:04:08 +01:00
Laurent Cozic 87298db0ec fix import 2021-08-05 16:01:46 +01:00
Laurent Cozic f2818a653b Desktop release v2.2.3 2021-08-05 15:09:58 +01:00
Laurent Cozic d7d05f85ff Should wait when copying file 2021-08-05 15:08:57 +01:00
Laurent Cozic 5b7a5de826 Desktop: Resolves #5184: GotoAnything sometimes is not working on first try 2021-08-05 14:40:54 +01:00
Laurent Cozic 69f0578ca9 Tools: Do not run slow updateIgnored script when running desktop app in dev mode 2021-08-05 14:35:58 +01:00
Laurent Cozic 6e82c8a8f9 Desktop: Fixes #5208: Focus is lost while searching in all notes 2021-08-05 14:35:08 +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 d3cd843fc8 Desktop: Fixed header spacing (regression) 2021-08-05 12:50:41 +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 5d176b5bc8 Desktop: Resolves #5256: Increase space between paragraphs in viewer and Rich Text editor to match Markdown editor 2021-08-05 12:30:00 +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 73e67deb37 Desktop: Fixes #5259: Fixed share note color in note list 2021-08-05 12:16:02 +01:00
Laurent Cozic bde39bf6b3 Desktop: Fixes #5268: Disable "Dropped file type is not supported" notification in Rich Text editor 2021-08-05 12:09:21 +01:00
Laurent Cozic 7f00e4ea5b Desktop: Turn old plugin deprecation notices into errors 2021-08-05 12:02:03 +01:00
Laurent Cozic 8471be16aa Doc: Improved "work together" section 2021-08-05 11:45:06 +01:00
Laurent Cozic b8c40da858 Update website 2021-08-05 11:39:00 +01:00
Laurent Cozic 4d3eff3682 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-05 11:38:22 +01:00
Laurent Cozic a16046e8a1 Doc: Updated FAQ 2021-08-05 11:37:49 +01:00
Alexander Dawson ceb57b515d All: Translation: Update nb_NO.po (#5263) 2021-08-04 07:24:26 -04:00
Laurent Cozic c4fcfec581 Server: Clarify beta transition message 2021-08-04 09:34:35 +01:00
Laurent Cozic 2a9654f9ab Server v2.2.11 2021-08-03 19:48:07 +01:00
Laurent Cozic 724aa726ca Server: Fixed support emails 2021-08-03 19:47:18 +01:00
Laurent Cozic 0fc4bc05f6 typo 2021-08-03 19:43:20 +01:00
Laurent Cozic db0e0ee17e Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-03 18:25:13 +01:00
Laurent Cozic 6ac22ed0a0 Server: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing 2021-08-03 18:24:33 +01:00
Abdullah Ibnu Hibban 4cfb804d61 All: Translation: Update id_ID.po (thanks to eresytter) (#5251) 2021-08-03 12:54:20 -04:00
reportxx a3c1be405e All: Translation: Update sv.po (#5262)
Please merge this pr to update the Swedish translation.
2021-08-03 12:53:29 -04:00
Laurent Cozic 1f1ee5c3c2 Doc: Add Joplin Cloud student discount info 2021-08-03 17:45:51 +01:00
Laurent Cozic 785248b27f Server: Disable beta account once expired 2021-08-02 17:56:25 +01:00
Laurent Cozic 89d4d5e642 Update website 2021-08-02 17:44:21 +01:00
Laurent Cozic 8910c87d15 Server: Handle beta user upgrade 2021-08-02 17:43:18 +01:00
Laurent Cozic 447cb2d92d Server v2.2.10 2021-08-01 11:05:29 +01:00
Laurent Cozic b5b6111e83 Server: Allows providing a coupon when creating the Stripe checkout session 2021-07-31 17:05:39 +01:00
Laurent Cozic 23553b70e0 Server v2.2.9 2021-07-31 14:53:29 +01:00
Laurent Cozic 03822487ec Update website 2021-07-31 14:46:37 +01:00
Laurent Cozic ef35b30645 Doc: Switch to prod mode 2021-07-31 14:45:39 +01:00
Laurent Cozic edf07488f4 Update website 2021-07-31 14:44:00 +01:00
Laurent Cozic 4f02c7359b Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-31 14:43:32 +01:00
Laurent Cozic f2547fed8d Server: Add support for Stripe yearly subscriptions 2021-07-31 14:42:56 +01:00
Helmut K. C. Tessarek d3a449a86e All: Translation: Update da_DK.po (thanks ERYpTION) 2021-07-28 13:26:22 -04:00
Laurent Cozic c76ed7f8ac Update translations 2021-07-28 13:35:40 +01:00
Laurent Cozic e9c11f5ac3 Tools: Filtered out problem files from translation build 2021-07-28 13:33:57 +01:00
Laurent Cozic 5c7fa587c0 Tools: Filtered out problem files from translation build 2021-07-28 13:25:49 +01:00
Laurent Cozic 6d86db3cb0 Update website 2021-07-26 18:22:25 +01:00
Laurent Cozic 361802273d Doc: Added sponsors and automatically build sponsor list on README 2021-07-26 18:21:19 +01:00
Laurent Cozic 8920db5537 Desktop: Fixes #5241: Katex code could be broken after editing it in Rich Text editor 2021-07-26 14:50:31 +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 8b08f0d2b3 Fixed config 2021-07-25 14:21:41 +01:00
Laurent Cozic fb9ec105df Desktop: Converted Clipper notification to a modal dialog that shows up in all screens 2021-07-25 13:15:56 +01:00
Laurent Cozic 53b4d7af68 Server: Improve installation instructions 2021-07-25 12:03:23 +01:00
Laurent Cozic 3a3aa701ac Desktop, Cli: Fixes #5232: Do not export share properties 2021-07-25 11:51:50 +01:00
Laurent Cozic 830712a3bb Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-25 11:15:54 +01:00
Laurent Cozic dd1f90819c Server: Fixes #5229: Published notes that contain non-alphabetical characters could end up being truncated 2021-07-25 11:13:27 +01:00
JackGruber 2ed8ac91a9 Server: Add Docker major, minor and beta version tags (#5237) 2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek 31c3093700 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 19:11:27 -04:00
Vaso3 769094f002 All: Translation: Update sr_RS.po (#5234)
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.

* Update sr_RS.po

Some more corrections

* Update sr_RS.po

* Update sr_RS.po
2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek a60d9fa61f All: Translation: Update pt_BR.po (thanks kuroppi) 2021-07-24 18:28:20 -04:00
Laurent Cozic 6499ca8e61 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 18:57:29 +01:00
Laurent Cozic 2b64b320fb Fixed tests 2021-07-24 18:56:30 +01:00
Laurent Cozic 282f782d50 Server: Fixed certain URLs 2021-07-24 18:34:42 +01:00
Laurent Cozic 5fcf2e48b3 Server v2.2.8 2021-07-24 17:56:36 +01:00
Laurent Cozic 63d4ccdc61 Merge branch 'dev' into release-2.2 2021-07-24 17:55:41 +01:00
Laurent Cozic 19b45de298 Server: Added form tokens to prevent CSRF attacks 2021-07-24 17:45:30 +01:00
Laurent Cozic b7e9848428 Server: Allow users to cancel Stripe subscription 2021-07-24 16:44:50 +01:00
Laurent Cozic 3f993af7fd Server: Explain how to use Joplin Server with a Joplin app 2021-07-24 15:14:07 +01:00
Laurent Cozic e1bd127b23 Update website 2021-07-24 11:15:07 +01:00
Ahmad Mamdouh d3c1edc3ee Fix wrong variable name (#5235) 2021-07-24 10:41:39 +01:00
Vaso3 471c06b3fd All: Translation: Update sr_RS.po (#5218)
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.
2021-07-23 15:51:51 -04:00
Laurent Cozic e83ab93644 Server: Allow user to upgrade account 2021-07-23 20:34:30 +01:00
Laurent Cozic 75a421edb1 Server: Allow admin to change Stripe subscription 2021-07-23 17:03:49 +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
Laurent Cozic 252d0695a4 Server: Handle Stripe webhook receiving multiple times the same event 2021-07-22 21:54:21 +01:00
Laurent Cozic 27c3cbdf8f Server: Allow enabling or disabling a user. Handle cancelling subscription. 2021-07-22 17:32:10 +01:00
Laurent Cozic 2b378880ce Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-22 17:30:50 +01:00
David Beale 52e1a05f4d Tools: Remove es module entry points from Turndown packages, as they are not being included in the dist (#5226) 2021-07-22 10:51:19 +01:00
Ahmad Mamdouh c89037b4a2 Plugins: Add ability to make dialogs fit the application window (#5219) 2021-07-22 10:21:57 +01:00
reportxx f611d7734b All: Translation: Update sv.po (#5221) 2021-07-21 14:27:50 -04:00
Laurent Cozic aadace42a2 Doc: Set website description meta tag 2021-07-21 16:19:01 +01:00
balmag 366ef025dc All: Translation: Update hu_HU.po (#5215)
Update Hungarian language file
2021-07-20 13:09:18 -04:00
Laurent Cozic 75cc73cc0c Desktop, Cli: Fixes #5213: Import highlighted text from ENEX files 2021-07-20 10:39:20 +01:00
Laurent Cozic b6cf9d1d5a Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-19 18:14:56 +01:00
Laurent Cozic 29a181f88f Doc: Remove image-rendering CSS 2021-07-19 17:33:34 +01:00
milotype 9ac56b3754 All: Translation: Update hr_HR.po (#5206) 2021-07-19 10:37:27 -04:00
Laurent Cozic 48d6c74a49 Update website 2021-07-19 14:47:33 +01:00
Laurent Cozic d4cdebafeb Doc: Automatic generation of responsive images 2021-07-19 14:37:59 +01:00
Laurent Cozic ea5a296d1f Update website 2021-07-19 11:01:01 +01:00
Laurent Cozic 1194f6879f Doc: Display Joplin Cloud links 2021-07-19 10:58:21 +01:00
Laurent Cozic 37ad6132b8 Desktop release v2.2.2 2021-07-19 10:45:30 +01:00
Laurent Cozic 2d92a0f1a0 Merge branch 'dev' into release-2.2 2021-07-19 10:45:03 +01:00
Laurent Cozic d469ac174c Merge branch 'release-2.1' into dev 2021-07-19 10:42:22 +01:00
Laurent Cozic 882d66383b Desktop release v2.1.9 2021-07-19 10:40:12 +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
小骏 73c75a8071 All: Translation: Update zh_CN.po (#5203)
* update zh_CN.po

* update zh_CN.po

* update zh_CN.po

* update zh_CN.po
2021-07-18 14:52:14 -04:00
balmag d2df19ed0c All: Translation: Update hu_HU.po (#5195) 2021-07-16 17:11:43 -04:00
Helmut K. C. Tessarek 62903874b5 Update translations 2021-07-16 14:18:48 -04:00
Laurent Cozic bad1bd0fc3 Update website 2021-07-16 18:07:43 +01:00
Laurent Cozic 36948732d6 Doc: Added higher res screenshot for 4k screens 2021-07-16 18:06:41 +01:00
Laurent Cozic f3e5a22ff2 Update website 2021-07-16 17:32:38 +01:00
Laurent Cozic e5d71d0cae Doc: Add Donate button A/B testing 2021-07-16 17:32:01 +01:00
Laurent Cozic eb0dd8dcd2 Update website 2021-07-16 17:14:56 +01:00
Laurent Cozic f3a69184b5 Doc: Rename "Support" to "Support us" 2021-07-16 17:14:12 +01:00
Laurent Cozic 4567b78f0c Server: Clarify error message when user info cannot be saved 2021-07-16 17:05:15 +01:00
Laurent Cozic 92520e58fb Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set 2021-07-16 16:56:21 +01:00
Laurent Cozic 7245aead39 Server: Make sure email URLs are displayed as clickable links 2021-07-16 16:37:18 +01:00
Laurent Cozic 9823ac3379 Tools: Fixed server test user creation 2021-07-16 16:35:58 +01:00
Laurent Cozic 7a164b9b87 Fixing mobile build 2021-07-16 15:50:33 +01:00
Laurent Cozic e125430748 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 14:32:09 +01:00
Laurent Cozic ed8a928a8e Fix mobile build 2021-07-16 14:30:52 +01: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 58c4f9eded Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 11:13:50 +01:00
Xavi Ivars 2c525c2163 All: Translation: Update ca.po (#5193) 2021-07-15 13:29:02 -04:00
stephan11HandStephan Hildebrand 68f119efbd All: Translation: Update de_DE.po (#5186)
* update german translation file

* update German translation file

* changed translation for *full changelog*

Co-authored-by: Stephan Hildebrand <stephan.hildebrand@rwth-aachen.de>
2021-07-15 12:51:33 -04:00
Elaborendum e88753c609 All: Translation: Update es_ES.po (#5190) 2021-07-15 12:49:27 -04:00
Laurent Cozic 8395d5daa9 Mobile: Added new beta editor based on CodeMirror 6 2021-07-13 19:13:13 +01:00
Laurent Cozic e01a17528a Mobile: Removed old editor code 2021-07-12 14:00:51 +01:00
Laurent Cozic b929a44bd5 Tools: Fixed iOS build for XCode 12
Ref: https://stackoverflow.com/a/67314652/561309
2021-07-12 13:51:23 +01:00
Laurent Cozic 131e6d6fb4 Doc: Disable GA in dev mode 2021-07-12 10:50:59 +01:00
Laurent Cozic 4ceca9e44c Doc: Clean up styling and bug fixes 2021-07-12 10:37:58 +01:00
Laurent Cozic 9dc703c312 Doc: Progressive enhancements on download page 2021-07-12 10:14:39 +01:00
Laurent Cozic 0f64c8d0fe Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-12 10:02:20 +01:00
Amanda 71e6aec144 Doc: Update download.md (#5180) 2021-07-11 23:13:28 +01:00
Laurent Cozic 6a93cb289e Server: Moved email templates to separate files 2021-07-11 22:11:20 +01:00
Laurent Cozic b3ca5cdc6f Doc: Redirect to Install section when trying to download Linux app 2021-07-11 19:20:18 +01:00
Laurent Cozic 952b2b3427 Server v2.2.7 2021-07-11 18:32:05 +01:00
Laurent Cozic 426915c75d Update website 2021-07-11 18:31:21 +01:00
Laurent Cozic f78ffc5e79 Doc: Moved sync section up and added more details 2021-07-11 18:30:42 +01:00
Laurent Cozic ff8f230555 Renamed "Share note" to "Publish note" 2021-07-11 18:08:42 +01:00
Laurent Cozic 1808367d78 comment 2021-07-11 18:05:51 +01:00
Laurent Cozic 89f4ca14e8 Server: Fixed mail queue as some emails were not being processed 2021-07-11 18:03:44 +01:00
Laurent Cozic a4255bb8fe Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-11 16:31:45 +01:00
Laurent Cozic f761bad6bb Tools: Jest slow threshold 2021-07-11 16:30:50 +01:00
philip-n 018381dad3 Doc: Fix typo (#5179)
cross-plaform --> cross-pla**t**form
2021-07-11 16:29:40 +01:00
Laurent Cozic 62b619865a Server: Added support for resetting user password 2021-07-11 16:28:07 +01:00
Laurent Cozic 240cb35756 Server: Check password complexity 2021-07-11 15:04:01 +01:00
Laurent Cozic f6f68e9413 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-11 11:43:25 +01:00
Laurent Cozic f8d2c26c8e Server: Disallow changing email address until a secure solution to change it is implemented 2021-07-11 11:35:49 +01:00
Helmut K. C. Tessarek 09a943e8c9 fixed typo 2021-07-10 18:44:53 -04: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 Cozic 54130bb4af Doc: Fixed download page on mobile and other tweaks 2021-07-10 12:40:48 +01:00
Laurent Cozic ca01eb35aa Update website 2021-07-10 11:43:35 +01:00
Laurent Cozic 576a5074ab Doc: Fixed paddings 2021-07-10 11:42:53 +01:00
Laurent Cozic e3db3871b6 Doc: Added cache buster timestamp to CSS and JS files 2021-07-10 11:29:18 +01:00
Laurent Cozic d411d14818 Update website 2021-07-10 11:22:31 +01:00
Laurent 5214da0a44 Doc: Added new website front page and moved doc under /help (#5169) 2021-07-10 11:16:13 +01:00
Laurent Cozic 4e0ff1f81f Desktop release v2.2.1 2021-07-09 18:09:39 +01:00
Laurent a73b749ddd Tools: Use GitHub Actions to build Windows app (#5166) 2021-07-09 17:50:12 +01:00
Laurent Cozic aa4f1146ca Server v2.2.6 2021-07-09 16:58:19 +01:00
Laurent Cozic 5a27d4dc31 Server: Fixed change processing logic 2021-07-09 16:52:23 +01:00
Philipp Keck bc97bb242a Desktop: Add keyboard shortcuts for inserting lists in Rich Text editor (#5137) 2021-07-09 10:48:50 +01:00
Lee Matos 47b283a367 iOS: Fixed dark theme in iOS (#5165) 2021-07-09 10:44:35 +01:00
JackGruber 41f01dcc34 Server: Add Docker image labels (#5158) 2021-07-08 14:04:03 +01:00
Sebastian Thomschke 3f21a6d9ab Move APP_PORT envvar to joplin service (#5163) 2021-07-07 21:25:11 +01:00
Laurent Cozic afe573dc86 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-07 10:07:43 +01:00
Arda Kılıçdağı ed7face070 Turkish Translations updated (#5156)
Turkish translations updated for the last version
2021-07-06 14:03:46 +01:00
Philipp Keck 6f836b372d Desktop: Fixes #4243: Fix double-paste also on Linux (#5143)
See https://github.com/laurent22/joplin/issues/4243.

Tested that it fixes the issue on Linux Mint with KDE.
2021-07-06 14:03:17 +01:00
Siddharth Magadum 6cfd868b44 Desktop: Fixes #4524: Empty note list panel does not scale with the note content panel (#5141) 2021-07-06 14:02:22 +01:00
John Freeman 3430f0bcae Plugins: Fix type of PostMessageHandler (#5138) 2021-07-06 14:00:51 +01:00
mbalint 4ae5108717 Desktop: Fixes #5111: Joplin crashes when trying to Change application layout (#5134) 2021-07-06 13:57:48 +01:00
Laurent Cozic bddbc0b54e ios-v12.1.2 2021-07-06 11:32:25 +01:00
Laurent Cozic cf89a06eb2 Doc: Fixed link 2021-07-05 10:55:45 +01:00
Laurent Cozic a8bc9d2a63 Update website 2021-07-04 19:12:50 +01:00
Laurent Cozic bfc8c1e3c1 Doc: Fixed scrolling to anchors 2021-07-04 18:29:55 +01:00
Laurent Cozic af15b8359b Doc: Updated website template 2021-07-04 18:14:32 +01:00
Laurent Cozic 6c1a6b0a61 Server: Fixed styling of shared note 2021-07-04 16:17:09 +01:00
Laurent 5ee4e2bf8e Doc: Added license in Assets directory
The goal is to prevent unauthorised use of these assets. For example to prevent someone from repackaging the app with malware and distributing it using Joplin branding.
2021-07-04 11:42:12 +01:00
Laurent Cozic f3359158b9 Server v2.2.5 2021-07-03 22:40:48 +01:00
Laurent Cozic e210926340 Server: Make app context immutable and derive the per-request context properties from it 2021-07-03 22:39:54 +01:00
Laurent Cozic 492c5851e3 Server v2.2.4 2021-07-03 22:11:29 +01:00
Laurent Cozic 238cc86590 Server: Fixed issue with user sessions being mixed up 2021-07-03 22:08:50 +01:00
Laurent Cozic 2dfb33442c Update website 2021-07-03 20:44:04 +01:00
Laurent Cozic 51d5e57b9f Server v2.2.3 2021-07-03 20:38:51 +01:00
Laurent Cozic 264f36f257 Server: Fixed size of a database field 2021-07-03 20:37:27 +01:00
Laurent Cozic 082c8ffecb Server v2.2.2 2021-07-03 19:28:47 +01:00
Laurent Cozic c420ad4392 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-03 19:28:20 +01:00
Laurent Cozic 8883df24df Server: Only emit "created" event when new user is saved 2021-07-03 19:24:23 +01:00
Laurent Cozic d99c34f1dd Server: Improved logging and reliability of cron tasks 2021-07-03 19:23:43 +01:00
Laurent Cozic 34a0b2abb7 Merge branch 'release-2.1' into dev 2021-07-03 17:06:43 +01:00
Laurent Cozic ab8dbcc73d Clipper release v2.1.3 2021-07-03 17:03:06 +01:00
Laurent Cozic 5258cc335a Clipper: Fixes #5130: Clipper does not remember notebook 2021-07-03 17:01:36 +01:00
Laurent Cozic 7d9a222fbb Server v2.2.1 2021-07-03 16:41:57 +01:00
Laurent Cozic 0bc892e40e Setup version 2.2 2021-07-03 16:40:44 +01:00
Laurent Cozic 125af75b93 Server: Remove dangerous "Delete all" button for now 2021-07-03 16:30:40 +01:00
Laurent Cozic 3d18514c3c Server: Display max size info in dashboard 2021-07-03 16:24:36 +01:00
Laurent Cozic 7447793e77 Server: Hide "Is Admin" from dashboard 2021-07-03 16:10:15 +01:00
Laurent Cozic 427218b1f4 Server: Normalize email addresses before saving them 2021-07-03 16:06:05 +01:00
Laurent Cozic b507fbf837 Server: Add support for account max total size 2021-07-03 15:27:55 +01:00
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 cebec1a992 Android 2.1.4 2021-07-03 09:33:36 +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
Laurent Cozic 37ff926181 Update website 2021-07-01 23:28:31 +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 705432d9e8 Android 2.1.3 2021-06-27 14:36:22 +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
Laurent Cozic 269ec34c83 Tools: Display CI steps 2021-06-25 09:49:06 +01:00
Laurent Cozic 8e35841d79 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-25 09:28:26 +01:00
Laurent Cozic 94ba8549b7 Tools: Fixed CI so that eslint runs on pull requests 2021-06-25 09:11:47 +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 638b3236cf Doc: Fixed links 2021-06-22 07:56:23 +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 4eec54cd48 Android 2.1.2 2021-06-20 19:37:13 +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 d129744138 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-20 14:35:56 +01:00
Laurent Cozic 975951ccbc Doc: Clarified logo and icon license 2021-06-20 14:33:33 +01:00
Denys Golubiev efb6aaf8cc Linux: Fixes #5105: Use --no-sandbox option for Linux Mint LDME 4 Debbie as well. (#5106) 2021-06-20 14:19:12 +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 e79f965e5d Android 2.1.1 2021-06-19 18:27:27 +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 240a624abd Update website 2021-06-16 19:59:40 +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 9e1e144311 Android 2.0.4 2021-06-16 13:22:51 +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 1711f7ec88 Android 2.0.3 2021-06-16 10:49:12 +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 b23cc5d30a Android 2.0.2 2021-06-15 21:08:28 +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
Laurent Cozic 3b6a66a016 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-12 09:57:54 +02:00
Laurent Cozic 5d7d1be363 Tools: Only install Docker Engine when server image needs to be built 2021-06-12 09:57:42 +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 6803f1c6a7 Tools: Fixed Docker login for CI 2021-06-12 08:52:09 +02: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 0120df7bdb Tools: Run CI on pull requests too 2021-06-10 23:24:44 +01: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 1ded589eeb Tools: Fixed macOS notarisation on CI 2021-06-10 17:43:09 +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 e617e6fab3 Tools: Migrated Continuous Integration to GitHub Actions (#5061)
And removed Travis
2021-06-10 13:01:55 +01: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
Laurent Cozic 824afd4809 Update website 2021-06-07 11:45:54 +02:00
Laurent Cozic 8ed1330d68 Doc: Added sponsor 2021-06-07 11:45:26 +02:00
Laurent Cozic fec5d4b335 Update website 2021-06-07 11:40:20 +02:00
Laurent Cozic e7b9103bfc Doc: Added sponsor 2021-06-07 11:39:34 +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
col 8afac643ba Update README.md (#5057) 2021-06-06 22:10:41 +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
Ji-Hyeon Gim 87257870f4 All: Translation: Update ko.po (#5043)
It updates Korean translation to be better.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-06-03 20:41:21 -04:00
Laurent Cozic 21ea3253db Desktop: Add Joplin Cloud sync target 2021-06-03 17:12:07 +02:00
Laurent Cozic 770af6a53b Server: Add Stripe integration 2021-06-03 15:21:02 +02:00
Laurent Cozic c88e4f6628 Tools: Trim white spaces in credential files 2021-06-02 21:59:53 +02:00
Laurent Cozic 2f79492192 Doc: Update travis-ci links 2021-06-02 14:58:27 +02:00
Laurent Cozic 69aa749205 Server v2.0.5 2021-06-02 10:26:38 +02:00
Laurent Cozic 87a5f18c7b Desktop release v2.0.4 2021-06-02 09:57:05 +02:00
Laurent Cozic 1d2a3a97d2 Keep Joplin Server name for now 2021-06-02 09:56:24 +02:00
Laurent Cozic 42891e37a1 Desktop release v2.0.3 2021-06-02 09:52:05 +02:00
Po-chiang Chao fe802b8ebc All: Translation: Update zh-TW (#5039)
* Update zh_TW.po

Update/tweak the translation to the latest version.

* Update zh_TW.po

Revisit the file with POEdit
2021-06-01 19:29:43 -04:00
Laurent Cozic 3cb6d4568c Revert "All: Translation: Update zh_TW.po (#5029)"
This reverts commit 2a58664735 as it's
invalid translations:

https://travis-ci.org/github/laurent22/joplin/jobs/772889793#L1499
2021-06-01 18:09:46 +02:00
Laurent Cozic a9f0a75d9d Releasing sub-packages 2021-06-01 11:28:50 +02:00
Laurent Cozic 07d30eb5d2 Plugin Repo: Only save stats every x hours 2021-06-01 11:26:13 +02:00
Laurent Cozic 8f6a47536c Desktop: Download plugins from GitHub release 2021-06-01 11:09:46 +02:00
Laurent Cozic d8d83b236e Releasing sub-packages 2021-06-01 10:42:46 +02:00
Laurent Cozic a355600e76 Plugin Repo: Add plugin assets to a release and save plugin stats 2021-06-01 10:39:31 +02:00
Po-chiang Chao 2a58664735 All: Translation: Update zh_TW.po (#5029)
Update/tweak the translation to the latest version.
2021-05-30 16:30:38 -04:00
Roman Musin 89bc181072 Delete ignored .js files (#5027) 2021-05-29 14:12:50 +01:00
Manuel Tassi ab7380a09f All: Translation: Update it_IT.po (#5011)
* Update it_IT.po

* Update it_IT.po
2021-05-28 18:37:36 -04:00
Laurent Cozic f8a26cf8f9 Server: Allow disabling item upload for a user 2021-05-27 16:25:37 +02:00
Laurent Cozic 3505a2a973 Doc: Fixed translation flags 2021-05-27 15:49:29 +02:00
Laurent Cozic 5f94de0f24 Fixed tests 2021-05-27 15:44:07 +02:00
Laurent Cozic 6811ea1eb9 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-27 15:34:12 +02:00
Laurent Cozic 7be59a7435 Doc: Update contributors 2021-05-27 15:33:51 +02:00
Laurent Cozic c0683ca4c3 Doc: Added script to build Sponsors table 2021-05-27 15:24:56 +02:00
JackGruber 2b286410f6 Desktop: Fixes #4411: Count tags based on showCompletedTodos setting (#4957) 2021-05-27 12:44:58 +01:00
Laurent Cozic 907ac7c1f8 Doc: Updated link for Chrome extension development 2021-05-27 13:35:05 +02:00
Laurent Cozic 8bc27021db Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-26 20:05:30 +02:00
Laurent Cozic 41ed66d323 Server: Added signup pages 2021-05-26 19:55:43 +02:00
Laurent Cozic 0ef7e98479 Server: Add version number on website 2021-05-26 15:53:27 +02:00
Laurent Cozic 161c77cb48 Server v2.0.4 2021-05-25 20:35:49 +02:00
Laurent Cozic 50d17bfb36 Merge branch 'dev' into release-2.0 2021-05-25 20:30:36 +02:00
Laurent Cozic ee0f23718b Server: Fixed Item and Log page when using Postgres 2021-05-25 20:29:59 +02:00
Laurent Cozic cfe4546a0b Server v2.0.3 2021-05-25 20:09:18 +02:00
Laurent Cozic f45e0d106f Merge branch 'dev' into release-2.0 2021-05-25 20:05:29 +02:00
Laurent Cozic 12a66342db Server: Fixed handling of request origin 2021-05-25 20:04:54 +02:00
Laurent Cozic f2b17560e6 Fixed tests 2021-05-25 19:18:33 +02:00
Laurent Cozic ba30dce6c8 server-v2.0.2 2021-05-25 19:17:42 +02:00
Laurent Cozic f5984313be package lock 2021-05-25 18:11:49 +02:00
Laurent Cozic df058352a5 Merge branch 'dev' into release-2.0 2021-05-25 17:51:55 +02:00
Laurent Cozic cde25fad92 Fixed tests and server build 2021-05-25 17:50:51 +02:00
Laurent Cozic d89bbc5571 Merge branch 'dev' into release-2.0 2021-05-25 17:23:43 +02:00
Laurent Cozic 71a7fc015a Server: Use external directory to store Postgres data in Docker-compose config 2021-05-25 17:20:22 +02:00
Laurent Cozic 83cef7a824 Server: Allow using a different domain for API, main website and user content 2021-05-25 16:42:21 +02:00
Laurent Cozic f65de0c9eb Merge branch 'dev' into release-2.0 2021-05-25 13:07:29 +02:00
Laurent Cozic 3edf74e6d2 Merge branch 'release-2.0' into dev 2021-05-25 13:06:36 +02:00
Laurent Cozic b01aa7eb45 Server: Make it more difficult to delete all data 2021-05-25 12:33:19 +02:00
Laurent Cozic e59e3aa7d1 Server: Defaults to enabling share when creating user from admin UI 2021-05-25 12:25:26 +02:00
Laurent Cozic 51051e0ee0 Server: Redirect to correct page when trying to access the root 2021-05-25 12:21:35 +02:00
Laurent Cozic b20ab19f13 Desktop: Rename Joplin Server to Joplin Cloud in UI 2021-05-25 12:16:57 +02:00
Laurent Cozic 68e79f1573 Server: Allow setting the path to the SQLite database using SQLITE_DATABASE env variable 2021-05-25 12:13:35 +02:00
Laurent Cozic ed8ee67048 Server: Add mailer service 2021-05-25 11:49:47 +02:00
Laurent Cozic 68b516998d Update website 2021-05-24 01:16:43 +02:00
Laurent Cozic 0fa7a66fb6 Doc: Android doc title 2021-05-24 01:16:21 +02:00
Laurent Cozic 13f39b9bd5 Update website 2021-05-24 01:15:21 +02:00
albertopasqualetto 013d37bd09 All: Translation: Update it_IT.po (#5003) 2021-05-23 16:36:02 -04:00
mbalint 4760e5e8ba Desktop: Fixes #4864: Fixes panels overflowing window (#4991) 2021-05-22 18:30:11 +01:00
Laurent Cozic 8930dac40e Desktop release v2.0.2 2021-05-21 17:45:13 +02:00
Laurent Cozic 3f0586ef63 Desktop: Displays error info when Joplin Server fails 2021-05-21 17:42:32 +02:00
Laurent Cozic e94503abbe Tools: Fixed tests 2021-05-21 17:02:56 +02:00
Laurent Cozic f8253cc2f0 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-21 15:17:51 +02:00
Laurent Cozic 2806aa1b19 Tools: Moved lib-specific tests under lib package 2021-05-21 15:17:21 +02:00
小骏 8f57e07279 All: Translation: Update zh_CN.po (#4993) 2021-05-21 00:48:05 -04:00
Laurent Cozic 6ff560f22f Desktop: Fixes #4591: Prevent cursor from jumping to top of page when pasting image 2021-05-20 19:13:35 +02:00
Laurent Cozic 2226b79c46 Desktop: Fixed pasting HTML in Rich Text editor, and improved pasting plain text 2021-05-20 18:08:59 +02:00
Laurent Cozic 9e9bf63d70 Desktop: Regression: Pasting plain text in Rich Text editor was broken 2021-05-20 17:42:04 +02:00
Breno Baptista 5d9419be5d Doc: Improved Linux notifications instruction (#4985) 2021-05-19 22:27:43 +01:00
Roman Musin 9f37aa96c6 Android: Fixes #4912, Fixes #4086, Fixes #4908: Fixed and improved alarm notifications (#4984) 2021-05-19 22:26:42 +01:00
JackGruber eceb14ff9e Desktop: Resolves #4433: Import linked local files when importing Markdown files (#4966) 2021-05-19 22:22:03 +01:00
Laurent Cozic 85211e8d5c Mobile: Fixes #4494: Fixed opening URLs that contain non-alphabetical characters 2021-05-19 16:48:55 +02:00
Laurent Cozic bd08041f53 Desktop: Pass custom CSS property to all export handlers and renderers 2021-05-19 15:00:16 +02:00
Laurent Cozic 77b284f01f Server: Added API end points to manage users 2021-05-18 17:11:50 +02:00
Laurent Cozic daaaa133ab Server: Allow enabling or disabling the sharing feature per user 2021-05-18 15:53:56 +02:00
Laurent Cozic e6c4eb7cdf Server: Renamed users.item_max_size => users.max_item_size 2021-05-18 15:11:03 +02:00
tatsu dc2cdb7d3a Doc: Fixed json of s3 bucket policy (#4981) 2021-05-17 15:15:23 -04:00
Andre Jilderda f3e03d48bb Desktop: Add classnames to DOM elements for theming purposes (#4933) 2021-05-17 19:33:44 +01:00
Laurent Cozic 6577f4f35d Desktop: Regression: It was no longer possible to add list items in an empty note 2021-05-17 20:30:48 +02:00
Laurent Cozic d29624c816 Desktop: Handle too large items for Joplin Server 2021-05-17 18:55:39 +02:00
Laurent Cozic 6afde54bda Server: Add support for item size limit 2021-05-17 18:35:01 +02:00
Laurent Cozic ec7f0f479a Server: Improved log table too and made it sortable 2021-05-17 17:29:21 +02:00
Laurent Cozic 7f05420fda Server: Improved Items table and added item size to it 2021-05-17 17:02:15 +02:00
Laurent Cozic a3f8cd4850 Merge branch 'release-2.0' into dev 2021-05-16 19:40:08 +02:00
Laurent Cozic 01ccf5170a Tools: Changelog for Android version 2021-05-16 19:38:36 +02:00
Laurent Cozic 6ddb69e1ea Server: Fixed bug when unsharing a notebook that has no recipients 2021-05-16 18:55:07 +02:00
Laurent Cozic b01f82bb33 Android release v2.0.1 2021-05-16 17:54:13 +02:00
Laurent Cozic b6c9edba21 Tools: Make sure branch has been pushed before releasing Android version 2021-05-16 17:50:50 +02:00
Laurent Cozic f7d164be6e Desktop: Allow unsharing a note 2021-05-16 17:28:49 +02:00
Laurent Cozic 6f2f24171d Desktop: Add Share Notebook menu item 2021-05-16 15:21:55 +02:00
Laurent Cozic 12cc64008b typo 2021-05-16 12:49:05 +02:00
Laurent Cozic b9955f58d3 Server: Refactor ShareType 2021-05-16 12:46:58 +02:00
Laurent Cozic 489995daef Server: Fixed deleting a note that has been shared 2021-05-16 12:42:58 +02:00
Laurent Cozic e156ee1b58 Server: Generate only one share link per note 2021-05-16 12:33:36 +02:00
Laurent Cozic a24b0091ad Server: Go back to home page when there is an error and user is logged in 2021-05-16 12:19:18 +02:00
Laurent Cozic 2655b6deee Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-16 11:48:15 +02:00
Laurent Cozic 45c40f7395 Server: Fixed log page 2021-05-16 11:46:16 +02:00
Woosuk Park ecb0eee355 All: Translation: Update ko.po (#4976)
* Some Translated. and some modified

* ko.po Update
2021-05-16 02:39:43 -04:00
suixinio 4916f4cc92 All: Translation: Update zh_CN.po (#4969)
This PR updates zh_CN.po, with just a minor translation fix.
2021-05-15 15:58:48 -04: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 0b46880a00 Desktop: Fixes #4926: Fixed issue with empty panels being created by plugins 2021-05-15 17:30:56 +02:00
Laurent Cozic deaa731983 Update translations 2021-05-15 16:15:55 +02:00
Laurent Cozic d061bb1a4f typo 2021-05-15 16:06:24 +02:00
Laurent Cozic 03db0c5486 Desktop: Resolves #4462: Improved usability when plugin repository cannot be connected to 2021-05-15 16:04:10 +02:00
Laurent Cozic bb275e671d Tools: Allow running the test units with Postgres 2021-05-15 15:13:08 +02:00
Laurent Cozic 2d0580ff71 Server: Fixed /items page when using Postgres 2021-05-15 15:10:40 +02:00
Laurent Cozic 2331d3487b Desktop, Cli: Resolves #4968: Import SVG as images when importing ENEX files 2021-05-15 13:42:57 +02:00
Laurent Cozic f1380fd51d Server: Fixes #4540: Make sure temp files are deleted after upload is done 2021-05-15 12:13:46 +02:00
Laurent Cozic d462dab8eb Update French translation 2021-05-15 11:36:52 +02:00
Laurent Cozic cf37b74d9a Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-15 11:14:40 +02:00
Laurent Cozic aec3ea9c0c Desktop, Cli: Fixes #4965: Improved importing Evernote notes that contain codeblocks 2021-05-15 11:12:11 +02:00
Helmut K. C. Tessarek 1f5aa70acd Update translations (for new server/client code) 2021-05-14 13:27:17 -04:00
Harris Arvanitis 416637ce83 All: Translation: Update el_GR.po (#4961) 2021-05-14 13:23:13 -04:00
Gen Neko 99c4b0bc01 All: Translation: Update ja_JP.po (#4960) 2021-05-14 13:22:35 -04:00
Laurent Cozic 74d8fec98a Desktop release v2.0.1 2021-05-14 17:17:40 +02:00
Laurent Cozic 321a58c356 Prepare for v2 2021-05-14 17:17:02 +02:00
Laurent Cozic 81884cf2ea add comment 2021-05-14 14:52:29 +02:00
Laurent Cozic d7ff634f5e Merge branch 'release-1.8' into dev 2021-05-14 14:50:04 +02:00
Laurent Cozic a965da97b6 ios-v10.8.1 2021-05-14 14:43:49 +02:00
Laurent Cozic b99cb0248d Cli: Fixes #4845: Fixed possible crash when trying to delete corrupted revision in revision service 2021-05-14 12:09:20 +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 Cozic 6959f14a3f Desktop: Fixes #4958: Display proper error message when JEX file is corrupted 2021-05-13 22:13:53 +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
JackGruber 09ad70983a Desktop: Fix #4581: Show or hide completed todos in search results based on user settings (#4951) 2021-05-13 13:23:17 +01:00
Helmut K. C. Tessarek 6e64b872cf Update translations 2021-05-13 05:34:25 -04:00
Helmut K. C. Tessarek d26b92500c All: Translation: Update da_DK.po (thanks ERYpTION) 2021-05-13 05:29:16 -04:00
Helmut K. C. Tessarek fc9aa33dbb Update readme downloads 2021-05-13 05:23:54 -04:00
Helmut K. C. Tessarek a286dbdf86 update website 2021-05-13 05:17:36 -04:00
Helmut K. C. Tessarek c3f2bce818 fix a few typos and grammar 2021-05-13 05:11:10 -04:00
Subhra264 df6f0ce9af Desktop: Fixes #4891: Solve "Resource Id not provided" error (#4943) 2021-05-13 09:34:03 +01:00
JackGruber 5f2998a6e2 Doc: Add sync status to FAQ (#4953) 2021-05-13 08:56:31 +01:00
Helmut K. C. Tessarek fa6981faa8 All: Add new date format YYMMDD (#4954) 2021-05-13 08:55:41 +01:00
JackGruber ce80d7e883 Generator: Fixed issue with handling of CRLF in ignore file (#4956) 2021-05-13 08:54:27 +01:00
Laurent Cozic 1a84ca204e Merge branch 'release-1.8' into dev 2021-05-11 15:05:01 +02:00
Edvin Saletovic 0d523e5394 All: Translation: Update bs_BA.po (#4942) 2021-05-10 16:27:31 -04:00
Laurent Cozic b28f087bbe Desktop release v1.8.5 2021-05-10 12:33:18 +02:00
Laurent Cozic ea536dbf87 Merge branch 'release-1.8' into dev 2021-05-10 12:23:39 +02:00
Laurent Cozic ed19424271 Plugin Generator release v1.8.1 2021-05-10 12:23:14 +02:00
Laurent Cozic 5d7a3ceff5 Doc: Fixed deploy doc 2021-05-10 12:22:56 +02:00
Laurent Cozic 610e1dc885 Doc: Add info on how to deploy each app 2021-05-10 12:21:55 +02:00
Laurent Cozic 553aa0fffa CLI v1.8.1 2021-05-10 11:39:11 +02:00
Laurent Cozic ebd650b62f Releasing sub-packages 2021-05-10 11:35:29 +02:00
Laurent Cozic 66dbbf3822 Plugins: Updated types 2021-05-10 11:33:28 +02:00
Laurent Cozic 1e27a4fcd2 Fix types 2021-05-10 11:32:31 +02:00
Laurent Cozic 9c20d5947d All: Security: Filter out NOSCRIPT tags that could be used to cause an XSS (thanks to Jubair Rehman for the PoC) 2021-05-10 11:22:12 +02:00
Laurent Cozic bb77d7171a Desktop: Fixes #4916: Fixed pasting of text and images from Word on Windows 2021-05-10 11:12:29 +02:00
Laurent Cozic 10bb689d5f Merge branch 'release-1.8' into dev 2021-05-09 20:07:40 +02:00
Laurent Cozic a76b4a0d3e Android release v1.8.5 2021-05-09 19:37:09 +02:00
Laurent Cozic 97c538dc48 Desktop release v1.8.4 2021-05-09 19:31:26 +02:00
Laurent Cozic 0b67446ec0 All: Security: Apply npm audit security fixes 2021-05-09 19:30:08 +02:00
Laurent Cozic 4b26893b21 Desktop: Fixes #4919: Make sure sync startup operations are cleared after startup 2021-05-09 18:12:47 +02:00
Woosuk Park 99410005a6 All: Translation: Update ko.po (#4930) 2021-05-08 15:07:47 -04:00
Laurent Cozic 4ea21e0c32 Desktop: Fixes #4916: Ensure that image paths that contain spaces are pasted correctly in the Rich Text editor 2021-05-04 17:44:30 +02:00
Laurent Cozic ebf92605ae Update website 2021-05-04 16:02:57 +02:00
Laurent Cozic 606a64f49c Fixed resource error handling 2021-05-04 16:00:40 +02:00
Laurent Cozic f76f99b423 Desktop: Improve display of release notes for new versions 2021-05-04 15:53:44 +02:00
Laurent Cozic 1f9388d62c Tools: Add pre-releases to stats and changelog 2021-05-04 13:34:32 +02:00
Laurent Cozic 5c7dd6df5a Android release v1.8.4 2021-05-04 11:11:40 +02:00
Laurent Cozic 26a91416c7 Desktop release v1.8.3 2021-05-04 11:06:25 +02:00
Laurent Cozic b5f01c005f linter 2021-05-04 11:05:20 +02:00
Adarsh Singh b1ecb75e1f Desktop: Resolves #4813 : Skip empty lines while converting selection to list (#4832) 2021-05-04 09:49:56 +01:00
Laurent Cozic a0ead2c48e Revert "Desktop: Resolve #3695: Show notebook and note title in the title bar (#4390)"
This reverts commit c79c9c4c2f.

Reason: Still need to discuss how it should be implemented. Ref:

https://discourse.joplinapp.org/t/testing-v1-8-2-title-bar-path-format-minor/16937/10
2021-05-04 10:34:18 +02:00
Nishant Mittal eb82ae87ca Desktop: Fixes #4767: Create own copy of images while pasting (#4852) 2021-05-03 15:13:51 +01:00
Laurent Cozic a6caa357c8 Desktop: Add synchronization tools to clear local sync state or data 2021-05-03 12:57:46 +02:00
milotype da4c61653f All: Translation: Update hr_HR.po (#4909) 2021-05-01 13:28:23 -04:00
Laurent Cozic eef86d6166 Cli: Add support for "batch" command 2021-05-01 16:09:59 +02:00
mbalint 4be5182913 Desktop: Fixes #4529: Plugin ghost panel and resizing issues (#4865) 2021-04-30 17:54:55 +01:00
Ahmad Mamdouh 92b4b967d9 Mobile, Desktop: Fixes #3991: Added RTL support for Markdown editor and Preview. (#4822) 2021-04-30 16:03:03 +01:00
Roman Musin 9a043bfca5 All: Bump KaTeX to 0.13.3 (#4902) 2021-04-30 12:59:09 +01:00
JackGruber 156a681ecf All: Add "id" and "due" search filters (#4898) 2021-04-29 15:27:38 +01:00
Roman Musin 5587f10487 All: Fixes #4706: Disable WebDAV response caching (#4887) 2021-04-26 14:45:31 +01:00
Helmut K. C. Tessarek 34540ed30a Update translations 2021-04-25 13:26:56 -04:00
Laurent Cozic bafa5053fd Tools: Display commit in changelog when a pull request is not available 2021-04-25 18:00:46 +02:00
Laurent Cozic 43feb1ea7e Android release v1.8.3 2021-04-25 11:08:30 +02:00
Laurent Cozic 2531e89457 Desktop release v1.8.2 2021-04-25 11:00:19 +02:00
Laurent Cozic 06ae47f507 lock files 2021-04-25 10:59:58 +02:00
Caleb John b1ea3f3ad1 Desktop: Add "duplicate line" command in Markdown editor (#4873)
Ref: https://discourse.joplinapp.org/t/duplicate-line-command/12650/15
2021-04-25 09:57:35 +01:00
Roman Musin f87ff54e3d Desktop: Fixes #4797 (partially): Scroll position is not remembered in Markdown editor (#4806) 2021-04-25 09:52:05 +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
Laurent Cozic 920f54f5d3 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-04-24 19:32:31 +02:00
Laurent Cozic de035dca39 Desktop: Add plugin info when the app crashes 2021-04-24 19:30:48 +02:00
Apoorva Shukla 1501238730 Desktop: Resolves #4736: Note list is empty if search field is cleared (#4739) 2021-04-24 17:30:07 +01:00
Brett Bender 108b5b4cdc Desktop: Fixes #4754: Roboto font in plugins (#4755) 2021-04-24 09:51:21 +01:00
Duncan Cunningham da8cc73df6 iOS: Add share extension (#4492) 2021-04-24 09:22:11 +01:00
Caleb John e95ea48ce9 Desktop: Fix: Fixed cursor moved to the top issue in Markdown editor (#4870)
Ref: https://discourse.joplinapp.org/t/cursor-moved-to-the-top-undo-history-removed/16837/6
2021-04-24 09:18:31 +01:00
JackGruber 0aef1f95ef All: Resolves #3157: Also duplicate the tags when the note is duplicated (#4876) 2021-04-24 09:16:36 +01:00
eresytter a67eab46f4 All: Translation: Update id_ID.po (#4878) 2021-04-22 12:33:33 -04:00
milotype f603440c30 All: Translation: Update hr_HR.po (#4875) 2021-04-22 12:32:47 -04:00
Tom 80b16dd17e All: Translation: Update nl_NL.po (#4868) 2021-04-20 18:34:04 -04:00
Ettore Atalan ad09bd93d6 All: Translation: Update de_DE.po (#4855)
This patch translates newly added strings and improves the existing translation.
2021-04-17 19:20:18 -04:00
Helmut K. C. Tessarek a29648d46c All: Translation: Update da_DK.po (thanks ERYpTION) 2021-04-15 21:26:24 -04:00
Whaell e7184f5f86 All: Translation: Update ar.po (#4844) 2021-04-15 19:32:33 -04:00
milotype 8789e557ea All: Translation: Update hr_HR.po (#4834) 2021-04-14 13:00:18 -04:00
Subhra264 f62bfbb853 Desktop: Fixes #4043: File-Links with German Umlauts don't work (#4804) 2021-04-12 13:35:39 +01:00
Laurent e06a640900 Update stale.yml
Added "cannot reproduce" label.
2021-04-11 18:38:22 +01:00
Laurent Cozic 5a620ee26e Desktop: Fixes #4669: Copying code block from Rich Text editor results in two copies of the text
Also improved copying plain text from Rich Text editor - in that case the HTML is converted to Markdown
2021-04-11 19:01:06 +02:00
Laurent Cozic 170f587f28 Desktop: Fixes #4570: Prevents plugin from causing an error when the app closes 2021-04-11 11:58:45 +02: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
Martin Korelič 9171a1ee9e All: Translation: Update sl_SI.po (#4826) 2021-04-10 07:28:12 -04:00
Ladislav Benc 30fab85caa Doc: Updating the kbd shortcut from the old ctrl+g to tne current ctrl+p (#4819) 2021-04-08 13:25:28 +01:00
Ahmad Mamdouh 1354c247b4 Desktop: Resolves #4766: ENTER key no longer submits dialogs when a textarea is focused. (#4777) 2021-04-08 10:31:26 +01:00
Nishant Mittal 9642f5f715 Desktop: Fixes #4788: Set plain/text clipboard while copying (#4791) 2021-04-08 10:30:12 +01:00
Caleb John f721d0123e Update wording for font settings (#4765) 2021-04-08 10:14:17 +01:00
Jalaj 518d7fc187 Desktop: Fixes #4697: Prevent Goto anything from changing folders when all notes filter is on (#4751)
Fixes #4697
2021-04-08 10:10:11 +01:00
Helmut K. C. Tessarek 35a1da0b08 update en_US.po 2021-04-07 15:45:46 -04:00
Helmut K. C. Tessarek 91bd8969cc Update translations 2021-04-07 15:40:29 -04:00
Helmut K. C. Tessarek 2fc9c53ff0 Desktop: Add an option to renew the API token (#4811) 2021-04-07 19:27:16 +01:00
Roman Musin e3efe70bab Android: Fixed sharing items from Joplin (#4718)
Ref: https://discourse.joplinapp.org/t/android-lost-access-to-resources/15716/4
2021-04-07 18:41:54 +01:00
Laurent Cozic 015aec503e Fixed ignored files 2021-04-07 19:13:07 +02:00
Laurent Cozic 54884d6db4 Desktop, Cli: Fixed issue when getting version info 2021-04-07 19:12:37 +02:00
Laurent Cozic 5667e687e9 Desktop: Regression: Fixed handling of provisional status of note 2021-04-07 18:57:44 +02:00
Gen Neko fbfca47ef3 All: Translation: Update ja_JP.po (#4815) 2021-04-06 16:43:20 -04:00
Aksh-Konda c37c2256c6 Desktop: Resolves #4759: Fixed editor focus issue when running command from palette (#4812) 2021-04-06 21:21:24 +01:00
asrient c79c9c4c2f Desktop: Resolve #3695: Show notebook and note title in the title bar (#4390) 2021-04-06 21:18:10 +01:00
Siddhant SehgalandSiddhant Sehgal 17792d91a1 Desktop: Fixes #4769: highlight existing text in global search field (#4773)
Co-authored-by: Siddhant Sehgal <ssehgal@makelearningbetter.co>
2021-04-06 19:13:43 +01:00
colorchestra d8ed15873b Doc: Update screenshots with new look (#4799)
* Doc: update desktop screenshots

* make images smaller
2021-04-06 04:14:06 -04:00
Helmut K. C. Tessarek 29a8e815d9 Update translations 2021-04-03 15:00:38 -04:00
Helmut K. C. Tessarek 0ff25b6302 Update web site 2021-04-03 14:57:32 -04:00
Laurent bfacf71397 Update donate.md 2021-04-02 14:43:07 +01:00
Laurent Cozic 7224165ae4 Android release v1.8.2 2021-04-02 15:29:53 +02:00
Adarsh Singh f59e312ee2 Desktop: Resolves #4750 Disappearing text in markdown editor (#4781)
Fixes #4750 by preventing automatic deletion of list elements in certain cases
2021-04-01 21:39:42 -06:00
Jessica Wu 829a245858 iOS: Fixes #3607: keyboards won't cover last line of note (#4794) 2021-04-01 19:32:03 +01:00
Vivek Vishal 75eea7b87c Doc: Update README.md (#4782)
* Rename server_delta_sharing.md to server_sharing.md
2021-03-31 14:39:41 -04:00
Muhammad Sanjar Afaq 4880ca19d6 Doc: Correct typo in Welcome (#4783)
"Applications" is confusing, it should be singular.
2021-03-31 08:09:06 +01:00
HOLLY wyh ad83f74532 All: Translation: Update zh_CN.po and zh_TW.po (#4771)
* Update zh_CN.po

correct a translation error and optimize some expressions

* Update zh_TW.po

Add some translations 、correct some errors and optimize some translations

* Update zh_TW.po

Add some translations , correct some errors, optimize some translations

* Update zh_TW.po

Add some translations , correct some errors, optimize some translations

* Update zh_TW.po

Add some translations , correct some errors, optimize some translations
2021-03-31 01:59:17 -04:00
Roman Musin 3a60efa153 Mobile: Fixes #4743: Make sync icon spin again (#4780) 2021-03-30 22:58:47 +01:00
Abdallah Ahmed c044017ba4 Desktop: Add button to copy note ID in Note Properties dialog (#4749) 2021-03-29 21:25:17 +01:00
Laurent Cozic 4810c01aec Android release v1.8.1 2021-03-29 11:48:22 +02:00
Laurent Cozic b3f950e67a Desktop release v1.8.1 2021-03-29 11:26:04 +02:00
Laurent Cozic f43edc2736 Update package lock 2021-03-29 11:25:14 +02:00
Martin Cejp ea65346f04 Linux: Joplin_install_and_update.sh: restore compatibility with older wget versions (#4752)
The `--show-progress` flag was introduced in wget 1.16 (2014). CentOS 7 only has wget 1.14.
2021-03-29 09:59:45 +01:00
Anakai Richards a2a80bc2e3 Desktop, Mobile: Resolves #3887: Improved solarized dark theme (#4748) 2021-03-29 09:46:47 +01:00
Nishant Mittal 9cf5974c7b Desktop: Fixes #4602: Allow copying images from Joplin to external editors (#4724) 2021-03-29 09:40:50 +01:00
Roman Musin 66ad2259a9 Tools: Change windows build tools install command (#4737)
Based on issues some people were having, e.g. https://discourse.joplinapp.org/t/build-error-on-windows-linux-arch/16104/2
2021-03-29 09:36:39 +01:00
mbalint c516ab405b Mobile: Resolves #720: Add "Sync only on Wi-Fi" option (#4729) 2021-03-29 09:35:39 +01:00
mrkaato 17295734fd All: Translation: Update fi_FI.po (#4745)
* Updated Translation in Finnish

Updated all and corrected a few errors in the previous translation.

* Update fi_FI.po

-tdd fixed -tnt
2021-03-28 13:35:51 -04:00
Laurent Cozic 3fa13828cd Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-03-26 17:56:18 +01:00
iamtalwinder 99b55129f2 Doc: Update TOC plugin (#4708) 2021-03-26 09:10:06 +00:00
Roman Musin 49e6b5cf62 Desktop: Set keep-alive for WebDAV/Nextcloud sync (#4668) 2021-03-26 09:09:19 +00:00
Caleb John 81b3ddf0e7 Desktop: Add monospace enforcement for certain elements in Markdown editor (#4689) 2021-03-26 09:08:22 +00:00
Tamás Hetesi e2db02887c Mobile: Fix flash of white when loading note bodies (#4629)
Refs #4450
2021-03-26 09:02:16 +00:00
Helmut K. C. Tessarek 0da3881aa6 add generated files to ignore files 2021-03-25 01:30:07 -04:00
mbalint cd1f95c5ea Desktop: Fixes #4723: Plugin Update error when plugin was installed manually (#4725) 2021-03-24 14:15:49 +00:00
Helmut K. C. Tessarek c119821c19 Doc: update node version on terminal page 2021-03-24 08:02:02 -04:00
Harshit Kathuria 656673ed57 Desktop: Fixes #4397: Fixed calendar styling (#4703) 2021-03-23 09:35:25 +00:00
mbalint 044477ba0d Desktop: Fixes #4683: Updating a disabled plugin enables it (#4711) 2021-03-23 09:01:34 +00:00
Jalaj 0985340a7f Desktop: Resolves #4614: Allow registering multiple settings in one call (#4627) 2021-03-23 09:01:02 +00:00
pomeloy 9e58af7232 All: Translation: Update de_DE.po (#4720) 2021-03-22 19:55:17 -04:00
Roman Musin 5b65186b4d Delete generated .js files (#4717) 2021-03-21 19:56:33 +00:00
Laurent Cozic 874f3010b7 Server: Added log page to view latest changes to files 2021-03-20 18:09:55 +01:00
Sandro a0ec926ba2 All: Translation: Update it_IT.po (#4707) 2021-03-18 18:28:24 -04:00
Laurent Cozic abe0013914 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-03-17 09:48:47 +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 39b3e0ac98 Update pull_request_guidelines.md 2021-03-17 08:43:22 +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 35063ac05c Update website 2021-03-16 11:55:00 +00:00
Laurent Cozic a3e1ff4bdd Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-03-16 11:53:59 +00:00
Laurent e3248b65f5 Update index.md 2021-03-16 11:53:08 +00:00
Laurent b12a937079 Update index.md 2021-03-16 11:52:49 +00:00
zozolina123 aa067e3d16 Desktop: Fixes #4398: Wrong background color for the table button in the toolbar (#4681) 2021-03-16 10:07:20 +00:00
Vijay Joshi 131a7e7362 Doc: Fixed typos and grammatical errors in readme files (#4678) 2021-03-15 20:20:16 -04:00
Laurent f92679c58a Update index.md 2021-03-15 17:10:55 +00:00
Laurent Cozic 674db9a543 Doc: Fixed GitHub star counter 2021-03-15 17:00:03 +00:00
Laurent Cozic 16a104c2fc Update website 2021-03-15 16:46:49 +00:00
Laurent Cozic de43a44c1f Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-03-15 16:34:40 +00:00
Laurent Cozic d76ec0ba0d Chore: Fixed TS issues 2021-03-15 16:33:42 +00:00
mbalint e81c7f2dd2 Desktop: Fixes #4612: Fix mermaid diagrams in WYSIWYG editor (#4670) 2021-03-15 16:31:11 +00:00
Laurent Cozic e954ecd024 Update website 2021-03-15 16:28:35 +00:00
Laurent Cozic dda0835189 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-03-15 16:28:07 +00:00
Laurent Cozic 1aca81b584 Doc: add donate button 2021-03-15 16:27:45 +00:00
Aman ba54bb02fa Fixed a typo in the Paste Special Project Idea (#4673) 2021-03-15 08:49:59 +00:00
Jess f459e4cbc6 Doc: Adds S3 Synchronization Info (#4675) 2021-03-15 08:42:02 +00:00
Laurent Cozic 76c143e8b0 Server: Prevent new user password from being hashed twice 2021-03-14 18:43:20 +00:00
Nishant Mittal f8b7d20255 API: Resolves #4655: Don't compress image when resource is added through api (#4660) 2021-03-14 15:28:34 +00:00
Roman Musin 74cd19f942 Android: Resolves #3547: Make Joplin resizeable (#4624) 2021-03-14 15:18:50 +00:00
Neeraj Kashyap fd390dff6b Desktop: Resolves #2810: Ctrl+Shift+B to viewer when editor invisible (#4537) 2021-03-14 15:06:38 +00:00
Laurent 6e0ec05d17 Update index.md 2021-03-14 11:23:04 +00:00
Laurent c1b325004a Update pull_request_guidelines.md 2021-03-14 11:07:45 +00:00
Laurent 4499408907 Update pull_request_guidelines.md 2021-03-13 09:58:25 +00:00
Laurent Cozic 10870ed6d4 Update website 2021-03-12 12:57:09 +00:00
Laurent 2f55738f16 Update ideas.md 2021-03-12 12:56:13 +00:00
Laurent 7fb1692565 Update pull_request_guidelines.md 2021-03-12 11:18:08 +00:00
Laurent Cozic dcbb6f5dd2 Update website 2021-03-12 11:15:12 +00:00
dartero 5c04c06d6f Update Joplin_install_and_update.sh (#4609) 2021-03-11 14:47:18 +00:00
Naveen M V a1423e4851 All: Filter "notebook" can now be negated (#4651) 2021-03-11 14:42:39 +00:00
Helmut K. C. Tessarek 3e9cb1d4fd Desktop: remove branch name in detached head state (#4636) 2021-03-11 14:39:18 +00:00
Caleb John 6496172aed Desktop: Bring editor katex highlight in line with renderer (#4632) 2021-03-11 14:37:58 +00:00
Caleb John 4d0beb6d47 Desktop: Toggle math highlighting in editor with markdown options (#4631) 2021-03-11 14:37:12 +00:00
Roman Musin c4fe38e632 Mobile: fix items shared to android not saved (#4607) 2021-03-11 14:31:39 +00:00
Roman Musin 7eb9305448 Desktop: Set keep-alive on http(s) requests (#4625) 2021-03-11 14:29:35 +00:00
Abhishek Ranjan 586fe2c690 Doc: Removed the Menu tag. (#4657)
As the Menu is already permanent and also it was not linked anywhere
2021-03-11 14:06:26 +00:00
Laurent a23a1acc46 Update pull_request_guidelines.md 2021-03-11 13:54:10 +00:00
Naveen M V 3657c0369e Chore: Clean up unused fuzzy search code (#4593) 2021-03-10 22:27:45 +00:00
Roman Musin ec99511397 Android: Fix issue with note not saved when created via sharing (#4604) 2021-03-10 19:20:40 +00:00
Roman Musin 01a9e49458 Mobile: Upgrade react-native-share (#4589) 2021-03-10 19:15:37 +00:00
Roman Musin d889cd55db Android: Resolves #4585: Set min android version to 5 / sdk 21 (#4590)
As per https://github.com/facebook/react-native#-requirements
2021-03-10 19:15:01 +00:00
Roman Musin 876fcfe008 Desktop: Fixes #4505: Make plugin links clickable from search (#4548) 2021-03-10 19:12:43 +00:00
Laurent 286a31a7f7 Update pull_request_guidelines.md 2021-03-10 11:13:00 +00:00
Zhang YANG 3d1c92685b All: Translation: Update zh_CN.po (#4648) 2021-03-10 02:05:37 -05:00
majsterkovic bbc41ab726 All: Translation: Update pl_PL.po (#4642) 2021-03-08 17:06:28 -05:00
Helmut K. C. Tessarek 31e9e7227c Update translations 2021-03-05 12:44:11 -05:00
Vyacheslav Andreykiv f7a41fbc8e All: Translation: Add Ukrainian (uk_UA.po) (#4622) 2021-03-05 12:38:19 -05:00
Glandos 1900ffe96d Fix typo in "ortograph(e|ique) (#4619) 2021-03-04 12:21:44 +00:00
dcaveiroandDiogo Caveiro 93441ea10b All: Translation: Update pt_PT.po (#4605)
100% translation. Thank you for the tutorial :)
Co-authored-by: Diogo Caveiro <50335724+Lorinson@users.noreply.github.com>
2021-02-28 14:11:07 -05:00
Nicolas Suzuki 65b0d7f2f7 All: Translation: Update pt_BR.po (#4599)
* Updating Brazilian Portuguese strings

Added missing translated strings. Fixed some incorrect translations. Standardized some words across all application's strings.

* Delete pt_BR.mo
2021-02-27 12:15:26 -05:00
Helmut K. C. Tessarek 22ea40e104 delete fr_FR.mo 2021-02-27 12:14:15 -05:00
Helmut K. C. Tessarek 93c35c9423 add .mo and .mo~ to .gitignore 2021-02-27 12:11:49 -05:00
Helmut K. C. Tessarek c86df6a480 Update translations 2021-02-24 01:27:00 -05:00
Helmut K. C. Tessarek 3ed7d4a72b fix code typo and all source and target translations 2021-02-24 01:23:13 -05:00
milotype b7eb2f9fa8 All: Translation: Update hr_HR.po (#4496)
* Update Croatian translation

- minor changes/corrections
- complete transaltion
- removed unused strings

* Updated hr_HR with reverted unused strings
2021-02-23 19:36:50 -05:00
James Wright 752c14d726 Desktop: Resolves #4554: Improve mathmode syntax highlighting (#4580) 2021-02-23 22:32:01 +00:00
SZŐKE, Sándor b0ddba5a61 All: Translation: Add Hungarian (hu_HU.po) (#4584) 2021-02-23 11:28:59 -05:00
António Ramadas e12af60579 Desktop: Select search text input when focusing it (#4586) 2021-02-23 11:25:13 +00:00
Roman Musin 0c58d238e8 Desktop: Fixes #4369: Refresh note tags when a note is moved to another folder (#4574) 2021-02-23 11:21:26 +00:00
Roman Musin 38e91ea1f7 Mobile: Fix incorrect field name when attaching a resource from share (#4557) 2021-02-23 11:03:09 +00:00
Caleb John da9da7ec62 Desktop: Reset window hash to allow clicking an anchor multiple times (#4538) 2021-02-23 10:59:08 +00:00
Caleb John 80cb18ca90 Desktop: Enforce utf-8 charset for plugin scripts (#4509) 2021-02-23 10:53:19 +00:00
Amanda 17962360e5 Doc: Clarifying that dev mode is started from CLI (#4421) 2021-02-23 10:44:35 +00:00
Amanda f01fb8d66c Docs: Clarifying how to get/test the hello world plugin via scaffolding (#4419) 2021-02-23 10:44:05 +00:00
Andrew Perry 7af1c9eaef Doc: Update rich_text_editor.md (#4583)
Fixed typo from "Rich Rext" to "Rich Text"
2021-02-22 19:11:13 -05:00
rxliuli 97ad84cef9 Doc: Fix link error (#4571) 2021-02-21 13:56:36 -05:00
Ji-Hyeon Gim 320755a294 All: Translation: Update ko.po (#4566)
It updates Korean translation to fix fuzzy translations.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-02-20 13:19:18 -05:00
Helmut K. C. Tessarek facba2811c Doc: change link for tessus 2021-02-19 22:19:40 -05:00
Helmut K. C. Tessarek fec4a905cb Update website 2021-02-19 18:45:17 -05:00
Laurent Cozic e1282bfd59 Update website 2021-02-19 15:50:39 +00:00
Laurent Cozic 9ef8e0ff4a Doc: add to menu 2021-02-19 15:50:15 +00:00
Laurent Cozic 57473a0aad Update website 2021-02-19 15:44:23 +00:00
Andrei DrynovandAndrei Drynov a6b866cbe1 All: Translation: Update ru_RU.po (#4550)
* Russian translation update

* Misspelling in "Toggle comment" string

Co-authored-by: Andrei Drynov <adrynov@pm.me>
2021-02-18 13:08:40 -05:00
Laurent 646eb6f266 Update ideas.md 2021-02-18 14:45:15 +00:00
Helmut K. C. Tessarek 95fd05b135 All: Translation: Update nl_BE.po (Thanks BertHammer)
/ref https://discourse.joplinapp.org/t/contribute-to-translation-po-file-cannot-be-opened/14926?u=tessus
2021-02-17 22:51:38 -05:00
Laurent bb99f51001 Update ideas.md 2021-02-17 14:43:38 +00:00
Laurent cab532873e Update ideas.md 2021-02-17 14:42:32 +00:00
mak2002 d7edde0bd8 Doc: Update BUILD.md (#4541) 2021-02-16 22:34:42 -05:00
konhi a836f531f6 All: Translation: Update pl_PL.po (#4534)
- complete translation
- minor corrections
2021-02-16 17:13:26 -05:00
Laurent Cozic 9bfc7d9860 Fixed tests 2021-02-09 20:58:17 +00:00
Laurent Cozic b7f37fdf89 Fixed schema 2021-02-09 18:15:27 +00:00
Laurent Cozic 69acced2fb Update website 2021-02-09 18:02:18 +00:00
Laurent Cozic a90e63935e Doc: schema dir 2021-02-09 18:01:52 +00:00
Laurent Cozic 71f976f6a5 Desktop, Cli: Save user settings to JSON file 2021-02-09 17:54:29 +00:00
Laurent Cozic 3a8aea1aa4 Fixed tests 2021-02-08 16:28:18 +00:00
Laurent Cozic f0943f7b67 Fixed tests 2021-02-08 15:36:36 +00:00
Laurent Cozic 4fb2bee330 Doc: Fix link for GSoC 2021 2021-02-07 19:08:44 +00:00
Laurent Cozic b4b913cf15 Doc: Added info about GSoC 2021 2021-02-07 19:04:49 +00:00
Laurent Cozic ce8f156f51 Desktop: Fixed issue which could cause plugin views to be orphaned 2021-02-07 16:47:56 +00:00
Laurent Cozic 26bce33e98 Plugins: Only call onNoteChange for the current note
Otherwise it could mean hundreds of updates when notes are being imported
or during sync.
2021-02-07 15:29:36 +00:00
Laurent Cozic 3ed19ba9f6 Releasing sub-packages 2021-02-07 14:35:40 +00:00
Laurent Cozic c1198dc76a setup v1.8 2021-02-07 14:34:43 +00:00
Laurent Cozic 3edea55976 Plugin Repo: Fixed git compare URL and added Dry Run mode 2021-02-07 14:33:10 +00:00
Laurent Cozic 19feb0c48b Desktop: Sort plugin config sections alphabetically 2021-02-07 13:02:58 +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 414b3636d9 Desktop: Fixes #4491: Make config sidebar vertically scrollable, and make it grow horizontally depending on menu items 2021-02-07 12:55:28 +00:00
Laurent Cozic 6f52107234 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-02-07 10:10:30 +00:00
Laurent Cozic c5b8d82234 Desktop: Fixes #4473: Improved enabling/disabling commands depending on application state 2021-02-07 10:09:28 +00:00
Laurent Cozic 526b16b931 Plugins: Resolves #4474: Focus dialog when it is opened so that ENTER/ESC shortcuts work 2021-02-07 09:39:56 +00:00
Helmut K. C. Tessarek 8f2594602c Update translations 2021-02-06 11:42:48 -05:00
Helmut K. C. Tessarek 4e3b055d0d Merge branch 'release-1.7' into dev 2021-02-06 11:27:43 -05:00
Elaborendum 0b6e4ac99b All: Translation: Update es_ES.po (#4467)
* Updated es_ES.po

* Reverting some changes

* Redid translation using current .po file

* Update es_ES.po

* Update es_ES.po
2021-02-06 11:19:18 -05:00
Ji-Hyeon Gim 341157483b All: Translation: Update ko.po (#4483)
It updates Korean translation to fix a translation warning.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-02-06 16:08:13 +00:00
Caleb John 33e1214ef6 Desktop: Undo changes introduced in #4303 (#4406) 2021-02-06 16:01:06 +00:00
Laurent Cozic 11c8bf7e6e Desktop: Resolves #4458: Improved spell checking support in dialogs and text input fields 2021-02-06 12:17:30 +00:00
Laurent Cozic bd5e3d363c Desktop: Fixes #4452: Fixed exporting as HTML or PDF when a plugin is active, and make sure plugin assets are also exported 2021-02-05 21:27:19 +00:00
Laurent Cozic 127a28e9b0 Desktop: Fixes #4416: Fixed formatting of consecutive code blocks 2021-02-05 16:51:37 +00:00
Whaell 1e8f1cd5c5 All: Translation: Update ar.po (#4477)
* Changes to the Arabic translation, added in all missing strings, will eventually probably take a look at ALL the strings, but for now this should hopefully bring the Arabic UX a few notches up!

* Deleting the MO File for Commit Consistency
2021-02-05 10:28:48 -05:00
Laurent Cozic 80d56c4d63 Android release v1.7.5 2021-02-03 12:29:04 +00:00
Laurent Cozic 91c4056aec Android release v1.7.4 2021-02-03 12:07:07 +00:00
Laurent Cozic f560563d89 Desktop release v1.7.11 2021-02-03 11:59:14 +00:00
Laurent Cozic ede600458a All: Regression: Fixed network request repeat mechanism 2021-02-03 11:58:18 +00:00
Arda Kılıçdağı 4a9d8033fa All: Translation: Update tr_TR.po (#4455)
* Update tr_TR.po

* Three dot character rolled back with actual three dots
2021-02-02 17:23:00 -05:00
Helmut K. C. Tessarek 6746b9af70 Merge branch 'release-1.7' into dev 2021-02-02 17:21:47 -05:00
Laurent Cozic ef281e8f74 Desktop: Save geo-location when saving note 2021-02-01 21:44:13 +00:00
Laurent Cozic 935b4dca0a ios-v10.7.2 2021-02-01 17:57:27 +00:00
Laurent Cozic 15d85f4ee4 Android release v1.7.3 2021-02-01 17:44:46 +00:00
Laurent Cozic fb165c87c3 Mobile: Fix search 2021-02-01 17:39:45 +00:00
Laurent Cozic 1f536ba3d9 Plugins: Fixes #4407: Apply "fields" query parameter when requesting data from data API 2021-02-01 12:41:25 +00:00
Laurent Cozic dac6c5fde2 Update website 2021-02-01 12:16:03 +00:00
Laurent Cozic 67cbc068c6 Merge branch 'release-1.7' into dev 2021-02-01 12:15:06 +00:00
Laurent Cozic 1c1558c7bf ios-v10.7.1 2021-02-01 11:53:52 +00:00
Laurent Cozic 613938e8c9 Tools: IOS release script 2021-02-01 11:53:25 +00:00
Laurent Cozic f24f8e8b47 Tools: IOS release script 2021-02-01 11:52:45 +00:00
Laurent Cozic e673ce132e Android release v1.7.2 2021-02-01 11:46:52 +00:00
Laurent Cozic 775e22818b Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-02-01 10:49:25 +00:00
Laurent Cozic b1b5069a23 Desktop: Fixes #4426: Improved handling of empty paths for Joplin Server sync target 2021-02-01 10:48:37 +00:00
hms5232 f38e7ec782 All: Translation: Update zh_TW.po (#4449)
improve terms and some typo in zh_TW.po
2021-01-31 22:07:59 -05:00
Laurent Cozic a419e1eb7c Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-31 22:24:05 +00:00
Laurent Cozic 52c7889731 Plugin Repo: do not create errors.json file as errors are already logged to file 2021-01-31 22:23:39 +00:00
Vaso3 de64e5e8f2 All: Translation: Update sr_RS.po (#4446)
Added and improved translation in the first 3k lines of the file
2021-01-31 14:24:27 -05:00
Laurent Cozic 07484de91e Server: Fixed crash when rendering note with links to non-existing resources or notes 2021-01-31 17:00:24 +00:00
Laurent Cozic 61399cec62 All: Fixed rendering of note and resource links 2021-01-31 16:58:25 +00:00
Laurent Cozic 98e5810197 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-31 15:20:40 +00:00
Laurent Cozic 02c251ed95 Doc: Update sponsors 2021-01-31 15:20:02 +00:00
Ji-Hyeon Gim 69cd63b57f All: Translation: Update ko.po (#4443)
It updates Korean translation for the plugin features

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-01-30 12:58:48 -05:00
Amanda 06b21848ac Doc: Updating to make it clear its a functioning plugin (#4420) 2021-01-30 14:54:02 +00:00
elsiehupp 40a4c69afe Doc: Workarounds for Linux build errors (#4409) 2021-01-30 14:53:22 +00:00
Laurent Cozic dadec484e9 Merge branch 'release-1.7' into dev 2021-01-30 12:21:14 +00:00
Laurent Cozic fb1c876b52 Desktop release v1.7.10 2021-01-30 12:20:28 +00:00
Laurent Cozic 285482804a Converted htmlUtils to TypeScript 2021-01-30 12:19:43 +00:00
Laurent Cozic 73314447b9 Desktop: Fixes #4441: Fixed copying text from Rich Text editor 2021-01-30 11:08:11 +00:00
Zhang YANG 477b9fb8e8 All: Translation: Update zh_CN.po (#4442)
* Update zh_CN translation (2020-12-29)

* Minor update

* Update zh_CN.po
2021-01-29 20:49:15 -05:00
Laurent Cozic cb2c2160ae Desktop: Fixed updating plugins 2021-01-29 21:54:08 +00:00
Laurent Cozic ccbc329cbf Server: Add support for sharing notes via a link 2021-01-29 18:45:11 +00:00
Gen Neko 4a847a096b All: Translation: Update ja_JP.po (#4440) 2021-01-29 01:29:32 -05:00
Helmut K. C. Tessarek 0b88b7a288 Doc: Update markdown plugin table (mermaid -> yes) 2021-01-28 14:06:40 -05:00
Vaso3andVasily db985b9faf All: Translation: Update sr_RS.po (#4438)
Added and improved translation in first 1k lines of the file

Co-authored-by: Vasily <50267052+VasilyKaiser@users.noreply.github.com>
2021-01-28 14:04:34 -05:00
yourcontact 8132311ce6 Doc: Update markdown plugin table (toc -> yes) (#4437)
Any of `${toc}, [[toc]], [toc], [[_toc_]]` works for me in Joplin so I infer the plugin is enabled.
2021-01-28 14:03:35 -05:00
Helmut K. C. Tessarek b0af917a35 Update translations 2021-01-28 11:37:28 -05:00
Ji-Hyeon Gim f898fd4ef0 All: Translation: Update ko.po (#4436)
It updates Korean translation to be better.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-01-28 11:29:18 -05:00
Laurent Cozic 42c80e6e28 Merge branch 'release-1.7' into dev 2021-01-28 10:22:33 +00:00
Laurent Cozic 2f8aafd85b Releasing sub-packages 2021-01-27 23:59:02 +00:00
Laurent Cozic 95253f70ea Plugin Repo: Add link to plugin commit in commit message 2021-01-27 23:57:08 +00:00
Laurent Cozic 4156b13c32 Desktop: Fixed plugin panel issue that could crash app in rare case
Ref: https://discourse.joplinapp.org/t/rearranging-the-pannels-crushed-the-app-and-generated-fatal-error/14373
2021-01-27 22:52:54 +00:00
Laurent Cozic 18dfc5a987 Desktop release v1.7.9 2021-01-27 22:13:10 +00:00
Laurent Cozic ae29238592 Desktop release v1.7.8 2021-01-27 22:12:05 +00:00
Laurent Cozic 99445cac27 Tools: Make sure notarization does not make Travis timeout the task 2021-01-27 22:11:40 +00:00
Caleb John de5bc45300 Change the Desktop check in the linux update script (#4405) 2021-01-27 21:45:49 +00:00
Laurent Cozic 95f59a67ea Android release v1.7.1 2021-01-27 17:49:13 +00:00
Laurent Cozic fb04a3ae20 Desktop release v1.7.7 2021-01-27 17:43:25 +00:00
Laurent Cozic 12187b9da3 Mobile: Fixed mobile build 2021-01-27 17:42:58 +00:00
Laurent Cozic 35597ce3c2 Doc: Updated doc for resource creation from a plugin 2021-01-27 13:00:10 +00:00
Laurent Cozic ea49242f24 Plugins: Add support for joplin.plugins.installationDir to allow accessing external files packaged with the plugin 2021-01-27 12:48:47 +00:00
Vaso3 f60f07ad19 All: Translation: Update sr_RS.po (#4429)
Corrected and added translation in the first 600 lines of the file.
2021-01-26 20:46:07 -05:00
Mats Schade 4e8299d444 Doc: Corrected WSL link in readme (#4423) 2021-01-26 20:42:02 -05:00
Laurent Cozic 8de46ed462 Desktop release v1.7.6 2021-01-26 23:57:01 +00:00
Laurent Cozic cda9441c69 Desktop: Fixed installing plugins 2021-01-26 23:56:35 +00:00
Laurent Cozic 11b8821bf4 Desktop release v1.7.5 2021-01-25 23:08:45 +00:00
Laurent Cozic f7a457fb6c Desktop, Cli: Some imported ENEX files incorrectly had invisible sections 2021-01-25 15:54:11 +00:00
Laurent Cozic 63a5bfa756 Server: Fixed error handling when no session is provided 2021-01-25 12:13:02 +00:00
Laurent Cozic e828c8e6eb Server: Fixes #4402: Fixed uploading empty file to the API 2021-01-25 12:04:18 +00:00
Laurent Cozic dbbbd22aef Desktop: Localise "Click to add tags" button 2021-01-25 10:20:56 +00:00
Laurent Cozic ad56d02eb8 Fixed CLI release script 2021-01-24 21:56:59 +00:00
Laurent Cozic adad4cab75 Doc: Automatically create Joplin Server changelog 2021-01-24 19:25:32 +00:00
Laurent Cozic 89a2e9fe9a Server release v1.7.2 2021-01-24 18:56:53 +00:00
Laurent Cozic 774be9cc0d Desktop: Do not allow installing plugins incompatible with current app version 2021-01-24 18:45:42 +00:00
Laurent Cozic 351a05fb0d Desktop: In config screen, click on a plugin name to open its home page 2021-01-24 18:20:00 +00:00
Laurent Cozic a320e113ac Plugins: Add support for joplin.plugins.require API to allow using sqlite3 or fs-extra from a plugin 2021-01-24 18:03:33 +00:00
Ji-Hyeon Gim 1509e6e58a All: Translation: Update ko.po (#4410)
It updates fuzzy/missing translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-01-24 12:09:55 -05: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 257cde4383 Desktop, Cli: Improved error handling when importing ENEX 2021-01-24 15:24:10 +00:00
Laurent Cozic 039da8c15c Releasing sub-packages 2021-01-23 16:20:38 +00:00
Laurent Cozic 0cbecabff2 Plugin Repo: Prevent faulty packages from generating commits on each check 2021-01-23 16:18:59 +00:00
Laurent Cozic 63559ac8b9 Tools: Apply eslint rule "no-multi-spaces" 2021-01-23 15:51:19 +00:00
Laurent Cozic 0e2351e79e Mobile: Removing no longer used beta Markdown editor
Ref: https://discourse.joplinapp.org/t/anyone-using-the-beta-editor-on-ios/11658
2021-01-22 23:36:02 +00:00
Laurent Cozic 86610e7561 Converted models and services to TypeScript 2021-01-22 17:41:11 +00:00
Laurent Cozic c895f7cd4f Desktop release v1.7.4 2021-01-22 10:56:22 +00:00
Laurent Cozic 83c1753049 Merge branch 'release-1.7' into dev 2021-01-22 10:55:00 +00:00
Laurent Cozic 22a7668d4b Server: Fixed password hashing when changing password 2021-01-22 01:11:06 +00:00
Laurent Cozic 469143c2e8 Plugins: Fixed dropdown settings 2021-01-22 00:55:58 +00:00
Laurent Cozic d4a6078392 Desktop: Enable TLS options for Joplin Server 2021-01-22 00:31:10 +00:00
Laurent Cozic 0c09202950 Update website 2021-01-21 23:12:49 +00:00
Laurent Cozic 5128ef22bf Fix CLI build 2021-01-21 23:12:04 +00:00
Laurent Cozic 43a8f4a46e Desktop: Added button to browse plugins 2021-01-21 22:57:09 +00:00
Laurent Cozic 63493214a0 Desktop: Move plugin settings under separate section in config menu 2021-01-21 22:40:14 +00:00
Laurent Cozic fa9f5fd458 Desktop: Fixes #4337: Make sure note is automatically saved when format is set via keyboard shortcut in Rich Text editor 2021-01-21 18:33:33 +00:00
Laurent Cozic 2d4ae4d8de Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-21 18:26:56 +00:00
Laurent Cozic 716a92944d Desktop, Mobile: Fixes #4363: Added missing translations 2021-01-21 18:23:32 +00:00
Laurent 2018a0bd61 Also keep medium priority issues open 2021-01-21 17:57:17 +00:00
Laurent Cozic 3ecf942b44 Merge branch 'release-1.6' into dev 2021-01-21 13:49:23 +00:00
Laurent Cozic 33db9883c9 ios-v10.6.3 2021-01-21 13:47:04 +00:00
Laurent Cozic 85355f8eda Android release v1.6.7 2021-01-21 11:25:45 +00:00
Laurent Cozic 1c696bf989 CLI v1.6.4 2021-01-21 10:02:05 +00:00
Laurent Cozic 7a8629c38d Cli: Fixed version number 2021-01-21 10:00:42 +00:00
Laurent Cozic 9b24c2f4a9 All: Disable log statement when saving settings 2021-01-21 09:57:53 +00:00
Laurent Cozic ff0c1b62b3 Releasing sub-packages 2021-01-21 00:17:54 +00:00
Laurent Cozic 1e611a7ab9 Tools: Added README for plugin-repo-cli 2021-01-21 00:16:59 +00:00
Laurent Cozic 58960071e7 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-21 00:13:39 +00:00
Laurent Cozic f9b0e2f6df Tools: Various improvements on plugin-repo-cli 2021-01-21 00:12:59 +00:00
Laurent Cozic fc7bd41c10 Desktop release v1.6.8 2021-01-20 15:49:39 +00:00
Laurent Cozic 8d35298500 Desktop: Fixes #4305: Fixed infinite sync issue with OneDrive
- Disable support for unreliable OneDrive delta sync, and switched to basic sync
- More robust error handling to take into account how unreliable the OneDrive API became
2021-01-20 15:49:02 +00:00
Daeraxa 197e43d78a Doc: Documentation update (released version v1.5.14) (#4306) 2021-01-20 11:59:03 +00:00
Laurent Cozic 0e1fb9f491 Desktop release v1.7.3 2021-01-19 23:05:06 +00:00
Laurent Cozic df1df6dc1f Tools: Minor tweaks on desktop release script 2021-01-19 23:04:49 +00:00
Laurent Cozic ad34cee234 Desktop release v1.7.2 2021-01-19 23:03:14 +00:00
Laurent Cozic ddf3e16ff0 Tools: Minor tweaks on desktop release script 2021-01-19 23:02:58 +00:00
Laurent Cozic 4e2e26f033 Desktop release v1.7.1 2021-01-19 22:59:19 +00:00
Laurent Cozic f37d37e613 Desktop: Allow updating a plugin 2021-01-19 22:58:09 +00:00
Laurent Cozic 63e30f6ccb Plugins: Updated types 2021-01-19 16:48:13 +00:00
Laurent Cozic 9c718baf61 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-18 20:11:17 +00:00
Laurent Cozic e8ae29adf2 Tools: Clean up and fix tool dependencies 2021-01-18 20:09:11 +00:00
eresytter 0c67805626 All: Translation: Update id_ID.po (#4387) 2021-01-18 14:16:58 -05:00
Laurent Cozic e91c94baca Added version command 2021-01-18 15:12:21 +00:00
Laurent Cozic aa74d05b24 Releasing sub-packages 2021-01-18 15:00:00 +00:00
Laurent Cozic 9a1f7f227d Build before publish 2021-01-18 14:59:16 +00:00
Laurent Cozic 40779d09c0 Releasing sub-packages 2021-01-18 14:49:39 +00:00
Laurent Cozic 351d8d94c5 Set version numbers 2021-01-18 14:49:14 +00:00
Laurent Cozic 6addd52ba4 Fix script 2021-01-18 14:48:42 +00:00
Laurent Cozic ea5849855f Releasing sub-packages 2021-01-18 14:42:40 +00:00
Laurent Cozic c81529dc45 Fix repo builder package.json 2021-01-18 14:42:23 +00:00
Laurent Cozic b6d7971691 Set version numbers on sub-packages 2021-01-18 14:40:39 +00:00
Laurent Cozic 446db2d688 Releasing sub-packages 2021-01-18 14:38:23 +00:00
Laurent Cozic 52da072f9a Plugins: Updated plugin repo script 2021-01-18 14:37:27 +00:00
Laurent Cozic 0d2bf6d787 Server: Improved config and support for Docker 2021-01-18 10:13:26 +00:00
Roman Musin 59fe4a2193 Mobile: When attaching a file to a note set correct title and extension (#4373) 2021-01-17 11:40:24 +00:00
Caleb John df6d146c84 SideBar -> Sidebar in app.ts (#4375) 2021-01-17 11:34:37 +00:00
Laurent Cozic eb3493f648 Server: Fixed tests and clean up 2021-01-15 22:02:36 +00:00
Laurent Cozic 7fd4c28a5b Plugin Generator release v1.7.3 2021-01-15 17:04:18 +00:00
Laurent Cozic d1b55aeceb Generator: Fixes #4360: Scripts were no longer being compiled 2021-01-15 17:03:38 +00:00
Laurent Cozic 413ec1a933 Server: Refactored to use Router class 2021-01-14 22:36:46 +00:00
Laurent Cozic 7ad29577f9 Server: Improved how routes can be defined 2021-01-14 18:27:59 +00:00
Laurent Cozic 7652a5a0a0 Server: Added tests for logout and fixed transaction deadlock 2021-01-14 17:18:27 +00:00
Laurent Cozic 105189fc57 Plugin Generator release v1.7.2 2021-01-14 15:48:10 +00:00
Laurent Cozic e559999aa4 Generator: Fixed crash when no external script needs to be compiled 2021-01-14 15:47:34 +00:00
Laurent Cozic 4a230d7cd5 Server: Removed all controller
These controllers were mostly here to allow testing the business logic.
However now that the routes are tested directly they are no longer
necessary. And testing the routes significantly increase the test
coverage.
2021-01-14 14:28:20 +00:00
Laurent Cozic 9b2e5e2959 Server: Removed the need for session controller 2021-01-14 13:29:03 +00:00
Laurent Cozic 3c5ac1ecc5 Server: Removed the need for file controller 2021-01-14 13:07:38 +00:00
Laurent Cozic 03dc1bbfe1 Server: Removed the need for profile controller 2021-01-14 12:50:45 +00:00
Laurent Cozic 80580ba54d Server: Clean up test units 2021-01-14 11:55:27 +00:00
Laurent Cozic 6a80b2ae9e Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-13 23:26:02 +00:00
Laurent Cozic f14ea46f0b Server: Moved controller tests to route and model 2021-01-13 23:20:45 +00:00
Laurent Cozic 247bd9bfd9 Server: Moved session tests to route 2021-01-13 22:06:47 +00:00
Laurent Cozic fc58db5d1a Server: Removed controller dependency from route 2021-01-13 21:50:43 +00:00
Robin Opletal 466cd836d7 Add support for the sway desktop environment (#4357)
Many sway users set $XDG_CURRENT_DESKTOP to sway. This could be detected.
2021-01-13 20:50:32 +00:00
Laurent Cozic 66a09e5068 Server: Moved file API tests to route 2021-01-13 18:11:35 +00:00
jibedoubleve b53e475f99 Update French translation + fix a typo (#4349) 2021-01-13 12:39:59 +00:00
Laurent Cozic ecb6134828 Plugin Generator release v1.7.1 2021-01-13 12:19:36 +00:00
Laurent Cozic 4b2bb1168b Setup new release version 1.7 2021-01-13 12:19:12 +00:00
Laurent Cozic 4743b0b5ce Plugins: Updated types 2021-01-13 12:17:54 +00:00
Laurent Cozic 3abf21d4ae Generator: Fixed issue that could result in an invalid JPL file 2021-01-13 12:16:36 +00:00
Laurent Cozic 6cdb16c8ab Server: Started moving controller tests to routes 2021-01-12 22:03:31 +00:00
rnbastos b7bfa2b997 Updated pt_BR translation (#4344) 2021-01-12 21:27:16 +00:00
Laurent Cozic eab2371206 Server: Add test units for sessions route 2021-01-12 18:08:14 +00:00
Laurent Cozic 63615ffbaf Server: Unit test request routing 2021-01-12 17:33:14 +00:00
Laurent Cozic 59fa51c5bf Server: Added test units for user login 2021-01-12 17:14:09 +00:00
Laurent Cozic c70f023fe0 Server: Added test units for notification handler 2021-01-12 16:49:39 +00:00
Laurent Cozic fb5eb1a47b Server: Dismiss admin password notification when password has been changed 2021-01-12 16:02:44 +00:00
Laurent Cozic 5aa5089ae0 Plugins: Add support for "keywords" manifest field 2021-01-12 15:34:59 +00:00
Laurent Cozic 4413e6a1ee Tools: Handle obsolete packages on plugin repo 2021-01-12 15:29:08 +00:00
Laurent Cozic 309a97fb5b Fixed publishing toggleSidebars plugin 2021-01-12 12:36:15 +00:00
Laurent Cozic 1b5b2342fc Move plugin under joplin namespace 2021-01-12 12:30:45 +00:00
Laurent Cozic 0f23277bfc Chore: SideBar => Sidebar 2021-01-12 12:28:55 +00:00
Laurent Cozic e595e19c0d Typo 2021-01-12 02:27:56 +00:00
Laurent Cozic 79dde365f0 Doc: Updated doc and tests for plugin postMessage() update 2021-01-11 23:34:06 +00:00
Laurent Cozic 2489409abb Plugins: Added support for bi-directional messages in content scripts and webview scripts using postMessage 2021-01-11 23:33:10 +00:00
Laurent Cozic cbad3b1190 Merge branch 'release-1.6' into dev 2021-01-11 22:41:26 +00:00
Laurent Cozic b74b849830 Desktop release v1.6.7 2021-01-11 22:18:24 +00:00
Caleb John 63a331c82f Desktop: Fixes #4338: Some commands were no longer working (#4343) 2021-01-11 22:17:55 +00:00
Caleb John b7313568de Desktop: Fixes #4338: Some commands were no longer working (#4343) 2021-01-11 22:17:34 +00:00
Laurent Cozic 25341858d5 Tools: Fixed plugin repo table and sort by name 2021-01-11 12:46:21 +00:00
Laurent Cozic dc6ae90113 Tools: Auto-update README when building plugin repo 2021-01-11 12:42:11 +00:00
Laurent Cozic 3c8d79975c Update website 2021-01-11 12:19:14 +00:00
1845 changed files with 317118 additions and 192204 deletions

No files matched your search

+2 -1
View File
@@ -6,4 +6,5 @@ packages/app-desktop
packages/app-cli
packages/app-mobile
packages/app-clipper
packages/generator-joplin
packages/generator-joplin
packages/plugin-repo-cli
+23 -6
View File
@@ -1,9 +1,26 @@
# Example of local config, for development:
# =============================================================================
# PRODUCTION CONFIG EXAMPLE
# -----------------------------------------------------------------------------
# By default it will use SQLite, but that's mostly to test and evaluate the
# server. So you'll want to specify db connection settings to use Postgres.
# =============================================================================
#
# JOPLIN_BASE_URL=http://localhost:22300
# JOPLIN_PORT=22300
# APP_BASE_URL=https://example.com/joplin
# APP_PORT=22300
#
# DB_CLIENT=pg
# POSTGRES_PASSWORD=joplin
# POSTGRES_DATABASE=joplin
# POSTGRES_USER=joplin
# POSTGRES_PORT=5432
# POSTGRES_HOST=localhost
# Example of config for production:
# =============================================================================
# DEV CONFIG EXAMPLE
# -----------------------------------------------------------------------------
# Example of local config, for development. In dev mode, you would usually use
# SQLite so database settings are not needed.
# =============================================================================
#
# JOPLIN_BASE_URL=https://example.com/joplin
# JOPLIN_PORT=22300
# APP_BASE_URL=http://localhost:22300
# APP_PORT=22300
+517 -462
View File
File diff suppressed because it is too large. Load diff
+5 -1
View File
@@ -37,6 +37,9 @@ module.exports = {
// Server admin UI global variables
'onDocumentReady': 'readonly',
'setupPasswordStrengthHandler': 'readonly',
'$': 'readonly',
'zxcvbn': 'readonly',
'tinymce': 'readonly',
},
@@ -76,7 +79,7 @@ module.exports = {
// Warn only for now because fixing everything would take too much
// refactoring, but new code should try to stick to it.
'complexity': ['warn', { max: 10 }],
// 'complexity': ['warn', { max: 10 }],
// Checks rules of Hooks
'react-hooks/rules-of-hooks': 'error',
@@ -125,6 +128,7 @@ module.exports = {
'space-before-blocks': 'error',
'spaced-comment': ['error', 'always'],
'keyword-spacing': ['error', { 'before': true, 'after': true }],
'no-multi-spaces': ['error'],
},
'plugins': [
'react',
+141
View File
@@ -0,0 +1,141 @@
#!/bin/bash
# =============================================================================
# Setup environment variables
# =============================================================================
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ROOT_DIR="$SCRIPT_DIR/../.."
IS_PULL_REQUEST=0
IS_DEV_BRANCH=0
IS_LINUX=0
IS_MACOS=0
if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
IS_PULL_REQUEST=1
fi
if [ "$GITHUB_REF" == "refs/heads/dev" ]; then
IS_DEV_BRANCH=1
fi
if [ "$RUNNER_OS" == "Linux" ]; then
IS_LINUX=1
IS_MACOS=0
else
IS_LINUX=0
IS_MACOS=1
fi
# =============================================================================
# Print environment
# =============================================================================
echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
echo "GITHUB_REF=$GITHUB_REF"
echo "RUNNER_OS=$RUNNER_OS"
echo "GIT_TAG_NAME=$GIT_TAG_NAME"
echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
echo "IS_DEV_BRANCH=$IS_DEV_BRANCH"
echo "IS_LINUX=$IS_LINUX"
echo "IS_MACOS=$IS_MACOS"
echo "Node $( node -v )"
echo "Npm $( npm -v )"
# =============================================================================
# Install packages
# =============================================================================
cd "$ROOT_DIR"
npm install
# =============================================================================
# Run test units. Only do it for pull requests and dev branch because we don't
# want it to randomly fail when trying to create a desktop release.
# =============================================================================
if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
echo "Step: Running tests..."
npm run test-ci
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
# =============================================================================
# Run linter for pull requests only. We also don't want this to make the desktop
# release randomly fail.
# =============================================================================
if [ "$IS_PULL_REQUEST" == "1" ]; then
echo "Step: Running linter..."
npm run linter-ci ./
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
# =============================================================================
# Validate translations - this is needed as some users manually edit .po files
# (and often make mistakes) instead of using a proper tool like poedit. Doing it
# for Linux only is sufficient.
# =============================================================================
if [ "$IS_PULL_REQUEST" == "1" ]; then
if [ "$IS_LINUX" == "1" ]; then
echo "Step: Validating translations..."
node packages/tools/validate-translation.js
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
fi
# =============================================================================
# Find out if we should run the build or not. Electron-builder gets stuck when
# building PRs so we disable it in this case. The Linux build should provide
# enough info if the app builds or not.
# https://github.com/electron-userland/electron-builder/issues/4263
# =============================================================================
if [ "$IS_PULL_REQUEST" == "1" ]; then
if [ "$IS_MACOS" == "1" ]; then
echo "Step: Not building Electron app"
exit 0
fi
fi
# =============================================================================
# Prepare the Electron app and build it
#
# If the current tag is a desktop release tag (starts with "v", such as
# "v1.4.7"), we build and publish to github
#
# Otherwise we only build but don't publish to GitHub. It helps finding
# out any issue in pull requests and dev branch.
# =============================================================================
cd "$ROOT_DIR/packages/app-desktop"
if [[ $GIT_TAG_NAME = v* ]]; then
echo "Step: Building and publishing desktop application..."
USE_HARD_LINKS=false npm run dist
elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
echo "Step: Building Docker Image..."
cd "$ROOT_DIR"
npm run buildServerDocker -- --tag-name $GIT_TAG_NAME
else
echo "Step: Building but *not* publishing desktop application..."
USE_HARD_LINKS=false npm run dist -- --publish=never
fi
+2
View File
@@ -9,7 +9,9 @@ exemptLabels:
- "upstream"
- "backlog"
- "high"
- "medium"
- "spec"
- "cannot reproduce"
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
+76
View File
@@ -0,0 +1,76 @@
name: Joplin Continuous Integration
on: [push, pull_request]
jobs:
Main:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-2016]
steps:
# Silence apt-get update errors (for example when a module doesn't
# exist) since otherwise it will make the whole build fails, even though
# it might work without update. libsecret-1-dev is required for keytar -
# https://github.com/atom/node-keytar
- name: Install Linux dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update || true
sudo apt-get install -y gettext
sudo apt-get install -y libsecret-1-dev
- name: Install Docker Engine
if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
run: |
sudo apt-get install -y apt-transport-https
sudo apt-get install -y ca-certificates
sudo apt-get install -y curl
sudo apt-get install -y gnupg
sudo apt-get install -y lsb-release
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
echo \
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update || true
sudo apt-get install -y docker-ce docker-ce-cli containerd.io
- uses: actions/checkout@v2
- uses: olegtarasov/get-tag@v2.1
- uses: actions/setup-node@v2
with:
node-version: '12'
# Login to Docker only if we're on a server release tag. If we run this on
# a pull request it will fail because the PR doesn't have access to
# secrets
- uses: docker/login-action@v1
if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Run tests, build and publish Linux and macOS apps
if: runner.os == 'Linux' || runner.os == 'macOs'
env:
APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
IS_CONTINUOUS_INTEGRATION: 1
run: |
"${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
- name: Build and publish Windows app
if: runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v')
env:
CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
IS_CONTINUOUS_INTEGRATION: 1
run: |
npm install
cd packages/app-desktop
npm run dist
+513 -462
View File
File diff suppressed because it is too large. Load diff
-138
View File
@@ -1,138 +0,0 @@
# Only build tags (Doesn't work - doesn't build anything)
if: tag IS present OR type = pull_request OR branch = dev
rvm: 2.3.3
# It's important to only build production branches otherwise Electron Builder
# might take assets from dev branches and overwrite those of production.
# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
branches:
only:
- master
- dev
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
matrix:
include:
- os: osx
osx_image: xcode12
language: node_js
node_js: "12"
cache:
npm: false
# Cache was disabled because when changing from node_js 10 to node_js 12
# it was still using build files from Node 10 when building SQLite which
# was making it fail. Might be ok to re-enable later on, although it doesn't
# make build that much faster.
#
# env:
# - ELECTRON_CACHE=$HOME/.cache/electron
# - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
- os: linux
sudo: required
dist: trusty
language: node_js
node_js: "12"
cache:
npm: false
# env:
# - ELECTRON_CACHE=$HOME/.cache/electron
# - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
# cache:
# directories:
# - node_modules
# - $HOME/.cache/electron
# - $HOME/.cache/electron-builder
before_install:
# HOMEBREW_NO_AUTO_UPDATE needed so that Homebrew doesn't upgrade to the next
# version, which requires Ruby 2.3, which is not available on the Travis VM.
# Silence apt-get update errors (for example when a module doesn't exist) since
# otherwise it will make the whole build fails, even though all we need is yarn.
# libsecret-1-dev is required for keytar - https://github.com/atom/node-keytar
- |
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install yarn
else
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update || true
sudo apt-get install -y yarn
sudo apt-get install -y gettext
sudo apt-get install -y libsecret-1-dev
fi
script:
- |
# Prints some env variables
echo "TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
echo "TRAVIS_BRANCH=$TRAVIS_BRANCH"
echo "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
echo "TRAVIS_TAG=$TRAVIS_TAG"
# Install tools
npm install
# Run test units.
# Only do it for pull requests because Travis randomly fails to run them
# and that would break the desktop release.
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
npm run test-ci
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
# Run linter for pull requests only - this is so that
# bypassing eslint is allowed for urgent fixes.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
npm run linter-ci ./
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
# Validate translations - this is needed as some users manually
# edit .po files (and often make mistakes) instead of using a proper
# tool like poedit. Doing it for Linux only is sufficient.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
node packages/tools/validate-translation.js
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
fi
# Find out if we should run the build or not. Electron-builder gets stuck when
# building PRs so we disable it in this case. The Linux build should provide
# enough info if the app builds or not.
# https://github.com/electron-userland/electron-builder/issues/4263
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
exit 0
fi
fi
# Prepare the Electron app and build it
#
# If the current tag is a desktop release tag (starts with "v", such as
# "v1.4.7"), we build and publish to github
#
# Otherwise we only build but don't publish to GitHub. It helps finding
# out any issue in pull requests and dev branch.
cd packages/app-desktop
if [[ $TRAVIS_TAG = v* ]]; then
USE_HARD_LINKS=false npm run dist
else
USE_HARD_LINKS=false npm run dist -- --publish=never
fi
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 MiB

+3
View File
@@ -0,0 +1,3 @@
All assets in this directory including, but not limited to, logos, icons
and images are copyright (c) Laurent Cozic, all rights reserved.
They may not be used without a permission.
+2 -1
View File
@@ -22,7 +22,8 @@ module.exports = {
return `joplin.${camelCaseToDots(p)
.replace(/menu\.items/, 'menuItems')
.replace(/toolbar\.buttons/, 'toolbarButtons')}`;
.replace(/toolbar\.buttons/, 'toolbarButtons')
.replace(/content\.scripts/, 'contentScripts')}`;
},
jpIsAllowedGroup: function(name) {
+7
View File
@@ -0,0 +1,7 @@
@charset "UTF-8";/*!
* Bootstrap v5.0.2 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/:root{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-primary:#0d6efd;--bs-secondary:#6c757d;--bs-success:#198754;--bs-info:#0dcaf0;--bs-warning:#ffc107;--bs-danger:#dc3545;--bs-light:#f8f9fa;--bs-dark:#212529;--bs-font-sans-serif:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans","Liberation Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--bs-font-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--bs-gradient:linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0))}*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-font-sans-serif);font-size:1rem;font-weight:400;line-height:1.5;color:#212529;background-color:#fff;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}.h1,h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){.h1,h1{font-size:2.5rem}}.h2,h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){.h2,h2{font-size:2rem}}.h3,h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){.h3,h3{font-size:1.75rem}}.h4,h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){.h4,h4{font-size:1.5rem}}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-bs-original-title],abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-left:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}.small,small{font-size:.875em}.mark,mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#0a58ca}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:var(--bs-font-monospace);font-size:1em;direction:ltr;unicode-bidi:bidi-override}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:left}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:left;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:left}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::file-selector-button{font:inherit}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}.lead{font-size:1.25rem;font-weight:30Line truncated
/*# sourceMappingURL=bootstrap.min.css.map */
File diff suppressed because it is too large. Load diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 723 KiB

@@ -0,0 +1,11 @@
<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M22.6857 0C20.9264 0.121687 18.8701 1.24781 17.6718 2.71423C16.5787 4.04454 15.6795 6.0204 16.0301 7.94058C17.9523 8.00039 19.9385 6.84746 21.0894 5.35628C22.166 3.96823 22.9807 2.00474 22.6857 0Z" fill="white"/>
<path d="M29.6386 11.2903C27.9494 9.17211 25.5755 7.94287 23.3335 7.94287C20.3739 7.94287 19.1219 9.3598 17.0656 9.3598C14.9454 9.3598 13.3346 7.947 10.7751 7.947C8.26088 7.947 5.58377 9.48355 3.88634 12.1112C1.50004 15.8113 1.90842 22.768 5.77558 28.6936C7.15951 30.8138 9.0075 33.198 11.4247 33.2187C13.5759 33.2393 14.1823 31.8389 17.0966 31.8244C20.0109 31.8079 20.5636 33.2372 22.7107 33.2145C25.13 33.196 27.079 30.5539 28.4629 28.4337C29.455 26.9136 29.8242 26.1485 30.5935 24.4325C24.998 22.3019 24.1008 14.3448 29.6386 11.2903Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="33" height="33" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1015 B

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20" role="img" aria-label="Donate: IBAN"><title>Donate: IBAN</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="49" height="20" fill="#555"/><rect x="49" width="37" height="20" fill="#007ec6"/><rect width="86" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="255" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="390">Donate</text><text x="255" y="140" transform="scale(.1)" fill="#fff" textLength="390">Donate</text><text aria-hidden="true" x="665" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="270">IBAN</text><text x="665" y="140" transform="scale(.1)" fill="#fff" textLength="270">IBAN</text></g></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

@@ -0,0 +1,4 @@
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.9997 13.75L14.6663 10.0833M10.9997 13.75V2.75V13.75ZM10.9997 13.75L7.33301 10.0833L10.9997 13.75Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M1.83301 15.5833L2.40226 17.8612C2.5014 18.2578 2.73026 18.6099 3.05248 18.8615C3.37469 19.1131 3.77177 19.2499 4.18059 19.2499H17.8188C18.2276 19.2499 18.6247 19.1131 18.9469 18.8615C19.2691 18.6099 19.498 18.2578 19.5971 17.8612L20.1663 15.5833" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

@@ -0,0 +1,10 @@
<svg width="33" height="38" viewBox="0 0 33 38" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M16.2643 8.97252C16.338 9.0089 16.3969 9.09623 16.4853 9.09623C16.5663 9.09623 16.6915 9.06712 16.6989 8.98707C16.7136 8.88519 16.559 8.8197 16.4632 8.77604C16.338 8.7251 16.1759 8.70327 16.0581 8.76876C16.0286 8.78332 15.9991 8.8197 16.0139 8.84881C16.036 8.94341 16.1833 8.92886 16.2643 8.97252ZM14.6511 9.09623C14.7395 9.09623 14.7985 9.0089 14.8721 8.97252C14.9532 8.92886 15.1005 8.94341 15.1299 8.85609C15.1447 8.82698 15.1152 8.79059 15.0857 8.77604C14.9679 8.71055 14.8058 8.73238 14.6806 8.78332C14.5849 8.82698 14.4302 8.89247 14.4449 8.99435C14.4523 9.06712 14.5775 9.1035 14.6511 9.09623ZM30.9375 29.3844C30.6723 29.0933 30.5471 28.5403 30.4072 27.9508C30.2746 27.3614 30.1199 26.7283 29.6337 26.3208C29.538 26.2408 29.4422 26.168 29.3391 26.1098C29.2433 26.0515 29.1402 26.0006 29.0371 25.9642C29.7148 23.9776 29.4496 21.9983 28.7645 20.2081C27.9248 18.0178 26.459 16.1039 25.3393 14.7941C24.0797 13.2295 22.8569 11.745 22.879 9.55467C22.9159 6.21455 23.2547 0.00729801 17.2956 2.10431e-05C9.75271 -0.0145329 11.6384 7.5244 11.5574 9.83848C11.4322 11.5413 11.086 12.8802 9.90003 14.5467C8.50784 16.184 6.54847 18.8255 5.62034 21.5835C5.17838 22.8861 4.97213 24.2105 5.16364 25.4621C4.68485 25.8842 4.32391 26.5318 3.94088 26.9321C3.6315 27.245 3.18217 27.3614 2.68864 27.536C2.19512 27.7107 1.65739 27.9727 1.32592 28.5912C1.17123 28.875 1.11967 29.1806 1.11967 29.4936C1.11967 29.7774 1.16387 30.0684 1.20806 30.3522C1.29646 30.9417 1.39222 31.4947 1.26699 31.8658C0.883957 32.9137 0.832394 33.6414 1.10494 34.1726C1.38485 34.7039 1.94467 34.9367 2.58552 35.0677C3.85985 35.3297 5.59088 35.2642 6.9536 35.9773C8.41208 36.7341 9.89266 37.0034 11.0712 36.7341C11.9257 36.5449 12.6255 36.0355 12.979 35.2642C13.8998 35.2569 14.9163 34.8712 16.5369 34.7839C17.6344 34.6966 19.0119 35.1696 20.5956 35.0823C20.6398 35.2496 20.6987 35.417 20.7797 35.5698V35.5771C21.3911 36.7923 22.5328 37.3454 23.7482 37.2508C24.971 37.1562 26.2601 36.4503 27.3061 35.2205C28.3078 34.0271 29.9578 33.5323 31.0554 32.8773C31.6005 32.5499 32.0424 32.1424 32.0793 31.5457C32.1087 30.9489 31.7552 30.2867 30.9375 29.3844ZM16.4779 6.35281C17.1998 4.73732 18.9971 4.76643 19.719 6.3237C20.1978 7.35703 19.9842 8.57228 19.4023 9.2636C19.2844 9.20538 18.9677 9.07439 18.4741 8.90702C18.5552 8.8197 18.7025 8.71055 18.7614 8.57228C19.115 7.7136 18.7467 6.6075 18.0911 6.58567C17.5534 6.54929 17.0672 7.37158 17.2219 8.25937C16.9199 8.11384 16.5295 8.00468 16.2643 7.93919C16.1907 7.43708 16.2422 6.87675 16.4779 6.35281ZM13.4799 5.51596C14.2239 5.51596 15.0121 6.54929 14.8869 7.95374C14.629 8.02651 14.3639 8.13567 14.1355 8.28848C14.2239 7.64083 13.8924 6.82581 13.4284 6.8622C12.8096 6.91314 12.7065 8.40491 13.2958 8.90702C13.3694 8.96524 13.4357 8.89247 12.8612 9.30726C11.7121 8.24482 12.0878 5.51596 13.4799 5.51596ZM12.4782 9.93308C12.9348 9.59834 13.4799 9.20538 13.5168 9.16899C13.863 8.84881 14.5112 8.13567 15.5719 8.13567C16.0949 8.13567 16.721 8.30304 17.4797 8.78332C17.9438 9.08167 18.3121 9.1035 19.1444 9.46007C19.7632 9.71477 20.1536 10.1659 19.9179 10.7845C19.7264 11.3011 19.1076 11.8324 18.2458 12.1016C17.4282 12.3636 16.7873 13.2659 15.4319 13.1859C15.1447 13.1713 14.9163 13.1131 14.7248 13.0331C14.1355 12.7784 13.8261 12.2763 13.2516 11.9415C12.6181 11.5922 12.2793 11.1847 12.1688 10.8281C12.0657 10.4716 12.1688 10.1732 12.4782 9.93308ZM12.7212 34.2381C12.5223 36.7923 9.48753 36.7414 7.17458 35.548C4.97213 34.3982 2.12146 35.075 1.53954 33.9543C1.36275 33.6123 1.36275 33.0302 1.73106 32.0332V32.0187C1.90784 31.4656 1.77525 30.8543 1.68686 30.2795C1.59847 29.7119 1.55427 29.1879 1.75315 28.8241C2.01097 28.3365 2.37927 28.1619 2.84333 28.0018C3.60204 27.7325 3.71253 27.7544 4.28708 27.2814C4.69222 26.8666 4.98686 26.3426 5.34043 25.9715C5.7161 25.5713 6.07704 25.3821 6.64422 25.4694C7.24088 25.5567 7.7565 25.9642 8.25739 26.6337L9.70114 29.2243C10.4009 30.6724 12.8759 32.7464 12.7212 34.2381ZM12.6181 32.3534C12.3161 31.8731 11.911 31.3637 11.5574 30.9271C12.0804 30.9271 12.6034 30.767 12.7875 30.2795C12.9569 29.8283 12.7875 29.1952 12.2424 28.4675C11.248 27.1431 9.42123 26.1025 9.42123 26.1025C8.42681 25.4912 7.86699 24.7417 7.60918 23.9267C7.35137 23.1117 7.3882 22.2311 7.58708 21.3652C7.97012 19.6988 8.95717 18.076 9.59065 17.0572C9.76007 16.9335 9.64958 17.2901 8.94981 18.5708C8.32369 19.7424 7.15248 22.4495 8.75829 24.567C8.80248 23.0607 9.16342 21.5253 9.77481 20.0917C10.6587 18.0978 12.5224 14.6413 12.6697 11.8906C12.7507 11.9488 13.0085 12.1234 13.1264 12.1889C13.4652 12.3854 13.723 12.6765 14.0545 12.9385C14.9679 13.6662 16.1538 13.6079 17.1777 13.0258C17.6344 12.7711 18.0027 12.48 18.3489 12.3709C19.0782 12.1453 19.6601 11.745 19.9915 11.2793C20.5587 13.4915 21.8846 16.6861 22.7317 18.2434C23.1811 19.0729 24.0797 20.8267 24.4701 22.9443C24.7132 22.937 24.9857 22.9734 25.273 23.0462C26.2895 20.4483 24.4112 17.6467 23.5567 16.868C23.2105 16.5333 23.1958 16.3877 23.3652 16.395C24.2933 17.21 25.5161 18.8474 25.9581 20.6884C26.1643 21.5326 26.2Line truncated
</g>
<defs>
<clipPath id="clip0">
<rect width="33" height="37.2581" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 6.7 KiB

@@ -0,0 +1,15 @@
<svg width="125" height="42" viewBox="0 0 125 42" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="M60.1792 29.4698C59.1749 29.4698 58.2454 29.2749 57.391 28.8852C56.5515 28.4804 55.8619 27.9183 55.3223 27.1987L56.9862 25.1975C57.8557 26.3967 58.8975 26.9964 60.1118 26.9964C61.7458 26.9964 62.5628 26.0295 62.5628 24.0957V15.9557H56.9637V13.5047H65.4859V23.9383C65.4859 25.7821 65.0362 27.1687 64.1368 28.0982C63.2373 29.0126 61.9182 29.4698 60.1792 29.4698Z" fill="#4F9CF9"/>
<path d="M74.7129 29.4024C73.4987 29.4024 72.4044 29.14 71.43 28.6153C70.4556 28.0907 69.6911 27.3636 69.1364 26.4342C68.5967 25.4898 68.3269 24.4254 68.3269 23.2412C68.3269 22.0569 68.5967 21.0001 69.1364 20.0707C69.6911 19.1412 70.4556 18.4142 71.43 17.8895C72.4044 17.3648 73.4987 17.1025 74.7129 17.1025C75.9422 17.1025 77.044 17.3648 78.0184 17.8895C78.9928 18.4142 79.7498 19.1412 80.2895 20.0707C80.8441 21.0001 81.1215 22.0569 81.1215 23.2412C81.1215 24.4254 80.8441 25.4898 80.2895 26.4342C79.7498 27.3636 78.9928 28.0907 78.0184 28.6153C77.044 29.14 75.9422 29.4024 74.7129 29.4024ZM74.7129 26.9964C75.7473 26.9964 76.6018 26.6516 77.2764 25.962C77.9509 25.2724 78.2882 24.3655 78.2882 23.2412C78.2882 22.1169 77.9509 21.2099 77.2764 20.5204C76.6018 19.8308 75.7473 19.486 74.7129 19.486C73.6786 19.486 72.8241 19.8308 72.1495 20.5204C71.49 21.2099 71.1602 22.1169 71.1602 23.2412C71.1602 24.3655 71.49 25.2724 72.1495 25.962C72.8241 26.6516 73.6786 26.9964 74.7129 26.9964Z" fill="#4F9CF9"/>
<path d="M90.4651 17.1025C91.6344 17.1025 92.6762 17.3573 93.5907 17.867C94.5201 18.3767 95.2471 19.0963 95.7718 20.0257C96.2965 20.9551 96.5588 22.0269 96.5588 23.2412C96.5588 24.4554 96.2965 25.5348 95.7718 26.4792C95.2471 27.4086 94.5201 28.1281 93.5907 28.6378C92.6762 29.1475 91.6344 29.4024 90.4651 29.4024C88.8461 29.4024 87.5644 28.8627 86.62 27.7834V33.6072H83.8092V17.2374H86.4851V18.8114C86.9498 18.2418 87.5194 17.8146 88.194 17.5297C88.8836 17.2449 89.6406 17.1025 90.4651 17.1025ZM90.1503 26.9964C91.1847 26.9964 92.0316 26.6516 92.6912 25.962C93.3658 25.2724 93.7031 24.3655 93.7031 23.2412C93.7031 22.1169 93.3658 21.2099 92.6912 20.5204C92.0316 19.8308 91.1847 19.486 90.1503 19.486C89.4757 19.486 88.8686 19.6434 88.3289 19.9582C87.7893 20.258 87.362 20.6928 87.0472 21.2624C86.7324 21.8321 86.575 22.4917 86.575 23.2412C86.575 23.9907 86.7324 24.6503 87.0472 25.22C87.362 25.7896 87.7893 26.2318 88.3289 26.5466C88.8686 26.8464 89.4757 26.9964 90.1503 26.9964Z" fill="#4F9CF9"/>
<path d="M99.2245 12.5603H102.035V29.245H99.2245V12.5603Z" fill="#4F9CF9"/>
<path d="M105.724 17.2374H108.535V29.245H105.724V17.2374ZM107.141 15.2586C106.631 15.2586 106.204 15.1012 105.859 14.7864C105.514 14.4566 105.342 14.0519 105.342 13.5722C105.342 13.0925 105.514 12.6952 105.859 12.3804C106.204 12.0506 106.631 11.8857 107.141 11.8857C107.651 11.8857 108.078 12.0431 108.423 12.3579C108.767 12.6578 108.94 13.04 108.94 13.5047C108.94 13.9994 108.767 14.4192 108.423 14.764C108.093 15.0937 107.666 15.2586 107.141 15.2586Z" fill="#4F9CF9"/>
<path d="M119.037 17.1025C120.552 17.1025 121.766 17.5447 122.68 18.4292C123.595 19.3136 124.052 20.6253 124.052 22.3642V29.245H121.241V22.724C121.241 21.6747 120.994 20.8876 120.499 20.363C120.004 19.8233 119.3 19.5535 118.385 19.5535C117.351 19.5535 116.534 19.8683 115.934 20.4979C115.335 21.1125 115.035 22.0045 115.035 23.1737V29.245H112.224V17.2374H114.9V18.789C115.365 18.2343 115.949 17.8146 116.654 17.5297C117.359 17.2449 118.153 17.1025 119.037 17.1025Z" fill="#4F9CF9"/>
<rect y="0.762695" width="40.4748" height="40.4748" fill="url(#pattern0)"/>
<defs>
<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
<use xlink:href="#image0" transform="scale(0.000833333)"/>
</pattern>
<image id="image0" width="1200" height="1200" xlink:href="data:image/png;base64,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 truncated
</defs>
</svg>

After

Width:  |  Height:  |  Size: 149 KiB

+15
View File
@@ -0,0 +1,15 @@
<svg width="92" height="30" viewBox="0 0 92 30" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="M44.6049 21.2777C43.8604 21.2777 43.1715 21.1333 42.5382 20.8444C41.916 20.5444 41.4049 20.1277 41.0049 19.5944L42.2382 18.1111C42.8827 18.9999 43.6549 19.4444 44.5549 19.4444C45.766 19.4444 46.3715 18.7277 46.3715 17.2944V11.2611H42.2215V9.44438H48.5382V17.1777C48.5382 18.5444 48.2049 19.5722 47.5382 20.2611C46.8715 20.9388 45.8938 21.2777 44.6049 21.2777Z" fill="white"/>
<path d="M55.3773 21.2277C54.4773 21.2277 53.6662 21.0333 52.9439 20.6444C52.2217 20.2555 51.6551 19.7166 51.2439 19.0277C50.8439 18.3277 50.6439 17.5388 50.6439 16.6611C50.6439 15.7833 50.8439 14.9999 51.2439 14.3111C51.6551 13.6222 52.2217 13.0833 52.9439 12.6944C53.6662 12.3055 54.4773 12.1111 55.3773 12.1111C56.2884 12.1111 57.1051 12.3055 57.8273 12.6944C58.5495 13.0833 59.1106 13.6222 59.5106 14.3111C59.9217 14.9999 60.1273 15.7833 60.1273 16.6611C60.1273 17.5388 59.9217 18.3277 59.5106 19.0277C59.1106 19.7166 58.5495 20.2555 57.8273 20.6444C57.1051 21.0333 56.2884 21.2277 55.3773 21.2277ZM55.3773 19.4444C56.1439 19.4444 56.7773 19.1888 57.2773 18.6777C57.7773 18.1666 58.0273 17.4944 58.0273 16.6611C58.0273 15.8277 57.7773 15.1555 57.2773 14.6444C56.7773 14.1333 56.1439 13.8777 55.3773 13.8777C54.6106 13.8777 53.9773 14.1333 53.4773 14.6444C52.9884 15.1555 52.7439 15.8277 52.7439 16.6611C52.7439 17.4944 52.9884 18.1666 53.4773 18.6777C53.9773 19.1888 54.6106 19.4444 55.3773 19.4444Z" fill="white"/>
<path d="M67.0528 12.1111C67.9195 12.1111 68.6917 12.2999 69.3695 12.6777C70.0584 13.0555 70.5972 13.5888 70.9861 14.2777C71.375 14.9666 71.5695 15.7611 71.5695 16.6611C71.5695 17.5611 71.375 18.3611 70.9861 19.0611C70.5972 19.7499 70.0584 20.2833 69.3695 20.6611C68.6917 21.0388 67.9195 21.2277 67.0528 21.2277C65.8528 21.2277 64.9028 20.8277 64.2028 20.0277V24.3444H62.1195V12.2111H64.1028V13.3777C64.4472 12.9555 64.8695 12.6388 65.3695 12.4277C65.8806 12.2166 66.4417 12.1111 67.0528 12.1111ZM66.8195 19.4444C67.5861 19.4444 68.2139 19.1888 68.7028 18.6777C69.2028 18.1666 69.4528 17.4944 69.4528 16.6611C69.4528 15.8277 69.2028 15.1555 68.7028 14.6444C68.2139 14.1333 67.5861 13.8777 66.8195 13.8777C66.3195 13.8777 65.8695 13.9944 65.4695 14.2277C65.0695 14.4499 64.7528 14.7722 64.5195 15.1944C64.2861 15.6166 64.1695 16.1055 64.1695 16.6611C64.1695 17.2166 64.2861 17.7055 64.5195 18.1277C64.7528 18.5499 65.0695 18.8777 65.4695 19.1111C65.8695 19.3333 66.3195 19.4444 66.8195 19.4444Z" fill="white"/>
<path d="M73.5452 8.74438H75.6286V21.1111H73.5452V8.74438Z" fill="white"/>
<path d="M78.363 12.2111H80.4463V21.1111H78.363V12.2111ZM79.413 10.7444C79.0352 10.7444 78.7185 10.6277 78.463 10.3944C78.2074 10.1499 78.0796 9.84994 78.0796 9.49438C78.0796 9.13883 78.2074 8.84438 78.463 8.61105C78.7185 8.36661 79.0352 8.24438 79.413 8.24438C79.7907 8.24438 80.1074 8.36105 80.363 8.59438C80.6185 8.81661 80.7463 9.09994 80.7463 9.44438C80.7463 9.81105 80.6185 10.1222 80.363 10.3777C80.1185 10.6222 79.8018 10.7444 79.413 10.7444Z" fill="white"/>
<path d="M88.2307 12.1111C89.3529 12.1111 90.2529 12.4388 90.9307 13.0944C91.6084 13.7499 91.9473 14.7222 91.9473 16.0111V21.1111H89.864V16.2777C89.864 15.4999 89.6807 14.9166 89.314 14.5277C88.9473 14.1277 88.4251 13.9277 87.7473 13.9277C86.9807 13.9277 86.3751 14.1611 85.9307 14.6277C85.4862 15.0833 85.264 15.7444 85.264 16.6111V21.1111H83.1807V12.2111H85.164V13.3611C85.5084 12.9499 85.9418 12.6388 86.464 12.4277C86.9862 12.2166 87.5751 12.1111 88.2307 12.1111Z" fill="white"/>
<rect width="30" height="30" fill="url(#pattern0)"/>
<defs>
<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
<use xlink:href="#image0" transform="scale(0.000833333)"/>
</pattern>
<image id="image0" width="1200" height="1200" xlink:href="data:image/png;base64,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 truncated
</defs>
</svg>

After

Width:  |  Height:  |  Size: 149 KiB

@@ -0,0 +1,6 @@
<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="17.5312" y="17.5312" width="10.3125" height="10.3125" fill="white"/>
<rect x="5.15625" y="17.5312" width="10.3125" height="10.3125" fill="white"/>
<rect x="17.5312" y="5.15625" width="10.3125" height="10.3125" fill="white"/>
<rect x="5.15625" y="5.15625" width="10.3125" height="10.3125" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 421 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 743 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

File diff suppressed because it is too large. Load diff
+7
View File
@@ -0,0 +1,7 @@
/*!
* Bootstrap v5.0.2 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("@popperjs/core")):"function"==typeof define&&define.amd?define(["@popperjs/core"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).bootstrap=e(t.Popper)}(this,(function(t){"use strict";function e(t){if(t&&t.__esModule)return t;var e=Object.create(null);return t&&Object.keys(t).forEach((function(s){if("default"!==s){var i=Object.getOwnPropertyDescriptor(t,s);Object.defineProperty(e,s,i.get?i:{enumerable:!0,get:function(){return t[s]}})}})),e.default=t,Object.freeze(e)}var s=e(t);const i={find:(t,e=document.documentElement)=>[].concat(...Element.prototype.querySelectorAll.call(e,t)),findOne:(t,e=document.documentElement)=>Element.prototype.querySelector.call(e,t),children:(t,e)=>[].concat(...t.children).filter(t=>t.matches(e)),parents(t,e){const s=[];let i=t.parentNode;for(;i&&i.nodeType===Node.ELEMENT_NODE&&3!==i.nodeType;)i.matches(e)&&s.push(i),i=i.parentNode;return s},prev(t,e){let s=t.previousElementSibling;for(;s;){if(s.matches(e))return[s];s=s.previousElementSibling}return[]},next(t,e){let s=t.nextElementSibling;for(;s;){if(s.matches(e))return[s];s=s.nextElementSibling}return[]}},n=t=>{do{t+=Math.floor(1e6*Math.random())}while(document.getElementById(t));return t},o=t=>{let e=t.getAttribute("data-bs-target");if(!e||"#"===e){let s=t.getAttribute("href");if(!s||!s.includes("#")&&!s.startsWith("."))return null;s.includes("#")&&!s.startsWith("#")&&(s="#"+s.split("#")[1]),e=s&&"#"!==s?s.trim():null}return e},r=t=>{const e=o(t);return e&&document.querySelector(e)?e:null},a=t=>{const e=o(t);return e?document.querySelector(e):null},l=t=>{t.dispatchEvent(new Event("transitionend"))},c=t=>!(!t||"object"!=typeof t)&&(void 0!==t.jquery&&(t=t[0]),void 0!==t.nodeType),h=t=>c(t)?t.jquery?t[0]:t:"string"==typeof t&&t.length>0?i.findOne(t):null,d=(t,e,s)=>{Object.keys(s).forEach(i=>{const n=s[i],o=e[i],r=o&&c(o)?"element":null==(a=o)?""+a:{}.toString.call(a).match(/\s([a-z]+)/i)[1].toLowerCase();var a;if(!new RegExp(n).test(r))throw new TypeError(`${t.toUpperCase()}: Option "${i}" provided type "${r}" but expected type "${n}".`)})},u=t=>!(!c(t)||0===t.getClientRects().length)&&"visible"===getComputedStyle(t).getPropertyValue("visibility"),g=t=>!t||t.nodeType!==Node.ELEMENT_NODE||!!t.classList.contains("disabled")||(void 0!==t.disabled?t.disabled:t.hasAttribute("disabled")&&"false"!==t.getAttribute("disabled")),p=t=>{if(!document.documentElement.attachShadow)return null;if("function"==typeof t.getRootNode){const e=t.getRootNode();return e instanceof ShadowRoot?e:null}return t instanceof ShadowRoot?t:t.parentNode?p(t.parentNode):null},f=()=>{},m=t=>t.offsetHeight,_=()=>{const{jQuery:t}=window;return t&&!document.body.hasAttribute("data-bs-no-jquery")?t:null},b=[],v=()=>"rtl"===document.documentElement.dir,y=t=>{var e;e=()=>{const e=_();if(e){const s=t.NAME,i=e.fn[s];e.fn[s]=t.jQueryInterface,e.fn[s].Constructor=t,e.fn[s].noConflict=()=>(e.fn[s]=i,t.jQueryInterface)}},"loading"===document.readyState?(b.length||document.addEventListener("DOMContentLoaded",()=>{b.forEach(t=>t())}),b.push(e)):e()},w=t=>{"function"==typeof t&&t()},E=(t,e,s=!0)=>{if(!s)return void w(t);const i=(t=>{if(!t)return 0;let{transitionDuration:e,transitionDelay:s}=window.getComputedStyle(t);const i=Number.parseFloat(e),n=Number.parseFloat(s);return i||n?(e=e.split(",")[0],s=s.split(",")[0],1e3*(Number.parseFloat(e)+Number.parseFloat(s))):0})(e)+5;let n=!1;const o=({target:s})=>{s===e&&(n=!0,e.removeEventListener("transitionend",o),w(t))};e.addEventListener("transitionend",o),setTimeout(()=>{n||l(e)},i)},A=(t,e,s,i)=>{let n=t.indexOf(e);if(-1===n)return t[!s&&i?t.length-1:0];const o=t.length;return n+=s?1:-1,i&&(n=(n+o)%o),t[Math.max(0,Math.min(n,o-1))]},T=/[^.]*(?=\..*)\.|.*/,C=/\..*/,k=/::\d+$/,L={};let O=1;const D={mouseenter:"mouseover",mouseleave:"mouseout"},I=/^(mouseenter|mouseleave)/i,N=new Set(["click","dblclick","mouseup","mousedown","contextmenu","mousewheel","DOMMouseScroll","mouseover","mouseout","mousemove","selectstart","selectend","keydown","keypress","keyup","orientationchange","touchstart","touchmove","touchend","touchcancel","pointerdown","pointermove","pointerup","pointerleave","pointercancel","gesturestart","gesturechange","gestureend","focus","blur","change","reset","select","submit","focusin","focusout","load","unload","beforeunload","resize","move","DOMContentLoaded","readystatechange","error","abort","scroll"]);function S(t,e){return e&&`${e}::${O++}`||t.uidEvent||O++}function x(t){const e=S(t);return t.uidEvent=e,L[e]=L[e]||{},L[e]}function M(t,e,s=null){const i=Object.keys(t);for(let n=0,o=i.length;n<o;n++){const o=t[i[n]];if(o.originalHandler===e&&o.delegationSelector===s)return o}return null}function P(t,e,s){const i="string"==typeof e,n=i?s:e;let o=R(t);return N.has(o)||(o=t),[i,n,o]}function j(t,e,s,i,n){if("string"!=typeof e||!t)return;if(s||(s=i,i=null),I.test(e)){const t=t=>function(e){if(!e.relatedTarget||e.relatedTaLine truncated
//# sourceMappingURL=bootstrap.min.js.map
+2
View File
@@ -0,0 +1,2 @@
/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^Line truncated
+91
View File
@@ -0,0 +1,91 @@
function getOs() {
if (navigator.appVersion.indexOf("Win")!=-1) return "windows";
if (navigator.appVersion.indexOf("Mac")!=-1) return "macOs";
if (navigator.appVersion.indexOf("X11")!=-1) return "linux";
if (navigator.appVersion.indexOf("Linux")!=-1) return "linux";
return null;
}
function getFilename(path) {
if (!path) return '';
const s = path.split('/');
return s.pop();
}
function getMobileOs() {
var userAgent = navigator.userAgent || navigator.vendor || window.opera;
// Windows Phone must come first because its UA also contains "Android"
if (/windows phone/i.test(userAgent)) {
return "windowsPhone";
}
if (/android/i.test(userAgent)) {
return "android";
}
// iOS detection from: http://stackoverflow.com/a/9039885/177710
if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
return "ios";
}
return "";
}
function setupMobileMenu() {
$("#open-menu-mobile").click(function () {
$("#menu-mobile").animate({ "margin-right": "0px" }, 300);
});
$("#close-menu-mobile").click(function () {
$("#menu-mobile").animate({ "margin-right": "-300px" }, 300);
});
}
function setupDownloadPage() {
if (!$('.page-download').length) return;
const downloadLinks = {};
$('.page-download .get-it-desktop a').each(function() {
const href = $(this).attr('href');
if (href.indexOf('-Setup') > 0) downloadLinks['windows'] = href;
if (href.indexOf('.dmg') > 0) downloadLinks['macOs'] = href;
if (href.indexOf('.AppImage') > 0) downloadLinks['linux'] = href;
});
$('.page-download .get-it-desktop').hide();
$('.page-download .download-click-here').click((event) => {
event.preventDefault();
$('.page-download .get-it-desktop').show(500);
});
const mobileOs = getMobileOs();
if (mobileOs) {
$('.page-download .intro').hide();
} else {
const os = getOs();
if (!os || !downloadLinks[os]) {
// If we don't know, display the section to manually download the app
$('.page-download .get-it-desktop').show();
} else if (os === 'linux') {
// If it's Linux, the user should probably install it using the
// install script so we redirect to the install section
window.location = 'https://joplinapp.org/help/#desktop-applications';
} else {
// Otherwise, start the download
const downloadLink = downloadLinks[os];
$('.downloaded-filename').text(getFilename(downloadLink));
window.location = downloadLink;
}
}
}
$(function () {
setupMobileMenu();
setupDownloadPage();
});
@@ -0,0 +1,415 @@
<!DOCTYPE html>
<html lang="en">
<head>
{{> gaOptimize}}
<meta
charset="utf-8"
http-equiv="X-UA-Compatible"
content="IE=edge,chrome=1"
/>
<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Joplin, the open source note-taking application" />
<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
<link
rel="stylesheet"
href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
as="style"
/>
<link
href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
rel="stylesheet"
as="style"
media="all"
onload="this.media='all'; this.onload = null"
/>
<script
src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
rel="preload"
as="script"
></script>
<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
<title>Joplin</title>
</head>
<body class="front-page website-env-{{env}}">
<div class="container-fluid" id="main-container">
{{#navbar}}
{{> navbar}}
{{/navbar}}
<div class="blue-bg" id="top-section">
<div class="container">
<div class="row">
<div class="col-12">
<div class="alert alert-danger alert-env-dev" role="alert">
Running in {{env}} mode!
</div>
<h1 class="text-center">
Free your <span class="frame-bg frame-bg-blue">notes</span>
</h1>
<p class="text-center" id="top-section-text">
Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.
</p>
<br />
<br />
<p class="text-center">
<a href="{{baseUrl}}/download/" class="button-link btn-blue download-button">Download the app</a>
{{#showJoplinCloudLinks}}
<a href="{{baseUrl}}/plans/" class="button-link btn-trans plans-button">Sign up with Joplin Cloud</a>
{{/showJoplinCloudLinks}}
</p>
<picture class="img-fluid img-center" id="top-section-img">
<source type="image/webp" srcset="
{{imageBaseUrl}}/home-top-img-4x.webp 4820w,
{{imageBaseUrl}}/home-top-img-2x.webp 2388w,
{{imageBaseUrl}}/home-top-img.webp 1205w
">
<source type="image/png" srcset="
{{imageBaseUrl}}/home-top-img-2x.png 2388w,
{{imageBaseUrl}}/home-top-img.png 1205w
">
<img id="top-section-img-img" src="{{imageBaseUrl}}/home-top-img-2x.png">
</picture>
</div>
</div>
</div>
</div>
<div id="multimedia-notes-section">
<div class="container">
<div class="row">
<div class="col-12 col-md-5 col-xxl-6">
<div class="ml-30 ml-mobile-0">
<h2 id="multimedia-title">
<span class="frame-bg frame-bg-yellow">Multimedia</span> notes
</h2>
<p id="multimedia-text">
Images, videos, PDFs and audio files are supported. Create
math expressions and diagrams directly from the app. Take
photos with the mobile app and save them to a note.
</p>
<br />
<p>
<a href="{{baseUrl}}/download/" class="button-link btn-blue">Download the app</a>
</p>
</div>
</div>
<div class="col-12 col-md-7 col-xxl-6">
<br class="d-block d-lg-none" />
<br class="d-block d-lg-none" />
<img
src="{{imageBaseUrl}}/multimedia-notes-img.png"
alt=""
class="img-fluid"
id="multimedia-notes-section-img"
/>
</div>
</div>
</div>
</div>
{{#showJoplinCloudLinks}}
<div id="work-together-section" class="gray-bg">
<div class="container">
<div class="row">
<div class="col-6 d-none d-md-block"></div>
<div class="col-12 col-md-6">
<div class="ml-30 ml-mobile-0">
<h2>Work <span class="frame-bg frame-bg-yellow">together</span></h2>
<p>
With Joplin Cloud, share your notes with your friends, family
or colleagues and collaborate on them.
</p>
<p>You can also publish a note to the internet and share the URL with others.</p>
<br/>
<p>
<a href="{{baseUrl}}/plans/" class="button-link btn-blue">Try it now</a>
</p>
<br class="d-block d-md-none" />
<br class="d-block d-md-none" />
<div class="text-center">
<img
src="{{imageBaseUrl}}/work-together-img.png"
alt=""
class="img-fluid d-block-inline d-md-none"
/>
</div>
</div>
</div>
</div>
</div>
</div>
{{/showJoplinCloudLinks}}
<div id="save-web-section" class="blue-bg">
<div class="container">
<div class="row">
<div class="col-12 col-md-6">
<div class="ml-30 ml-mobile-0">
<h2 id="save-web-title">
Save <span class="frame-bg frame-bg-blue">web pages</span> <br />as notes
</h2>
<p>
Use the web clipper extension, available on Chrome and
Firefox, to save web pages or take screenshots as notes.
</p>
<br />
<p>
<a href="{{baseUrl}}/clipper/" class="button-link btn-blue">Get the clipper</a>
</p>
</div>
</div>
<div class="col-12 col-md-6">
<br class="d-block d-md-none" />
<br class="d-block d-md-none" />
<img
src="{{imageBaseUrl}}/save-web-img.png"
alt=""
class="img-fluid"
id="save-web-img"
/>
</div>
</div>
</div>
</div>
<div id="customise-it-section">
<div class="container">
<div class="row">
<div class="d-none d-md-block col-md-6">
<img
src="{{imageBaseUrl}}/customise-it-img.png"
alt=""
class="img-fluid"
/>
</div>
<div class="col-12 col-md-6">
<div class="ml-30 ml-mobile-0">
<h2 id="customise-it-title">
<span class="frame-bg frame-bg-yellow-lg">Customise</span> it
<br />
to your needs
</h2>
<p>
Customise the app with plugins, custom themes and multiple
text editors (Rich Text or Markdown). Or create your own
scripts and plugins using the Extension API.
</p>
<br />
<p>
<a href="{{baseUrl}}/help/#plugins" class="button-link btn-blue">Find out more</a>
</p>
<br class="d-block d-lg-none" />
<br class="d-block d-lg-none" />
<img
src="{{imageBaseUrl}}/customise-it-img.png"
alt=""
class="img-fluid d-block d-md-none"
/>
</div>
</div>
</div>
</div>
</div>
<div id="your-note-section" class="blue-bg">
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="text-center">
Your notes, <span class="frame-bg frame-bg-blue-lg">everywhere</span> you are
</h2>
<p class="text-center" id="your-note-text">
Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!
</p>
<br />
<br />
<p class="text-center">
<a href="{{baseUrl}}/download/" class="button-link btn-blue">Download it now</a>
</p>
<br />
</div>
</div>
</div>
</div>
<div id="your-data-section" class="gray-bg">
<div class="container">
<div class="row">
<div class="col-12 col-md-6">
<br class="d-block d-md-none" />
<div class="ml-30 ml-mobile-0">
<h2>100% <span class="frame-bg frame-bg-yellow-lg">your data</span></h2>
<p>
The app is open source and your notes are saved to an open
format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but
yourself can access them.
</p>
<br />
<p>
<a href="{{baseUrl}}/e2ee/" class="button-link btn-blue">More about E2EE</a>
</p>
</div>
</div>
<div class="col-12 col-md-6">
<br class="d-block d-md-none" />
<br class="d-block d-md-none" />
<br class="d-block d-md-none" />
<img
src="{{imageBaseUrl}}/your-data-img.png"
alt=""
class="img-fluid"
/>
</div>
</div>
</div>
</div>
<div id="in-the-press-section">
<div class="container">
<div class="row">
<div class="col-12">
<br />
<h2 class="text-center">
In the <span class="frame-bg frame-bg-yellow">Press</span>
</h2>
<br />
</div>
<div class="d-none d-md-block col-3">
<img
src="{{imageBaseUrl}}/in-the-press-img-left.png"
alt=""
class="img-fluid d-none d-md-block"
/>
</div>
<div class="d-none d-md-block col-6">
<div
id="{{pressCarouselRegular.id}}"
class="carousel slide d-none d-md-block"
data-bs-ride="carousel"
>
{{#pressCarouselRegular}}
{{> pressCarouselButtons}}
{{/pressCarouselRegular}}
<div class="carousel-inner">
{{#pressCarouselRegular.items}}
{{> pressCarouselItem}}
{{/pressCarouselRegular.items}}
</div>
</div>
</div>
<div class="d-none d-md-block col-3">
<div class="text-right">
<br />
<img
src="{{imageBaseUrl}}/in-the-press-img-right.png"
alt=""
class="img-fluid d-none d-md-inline-block"
/>
</div>
</div>
</div>
<div class="row d-block d-md-none">
<div class="col-12">
<div
id="{{pressCarouselMobile.id}}"
class="carousel slide"
data-bs-ride="carousel"
>
{{#pressCarouselMobile}}
{{> pressCarouselButtons}}
{{/pressCarouselMobile}}
<div class="carousel-inner">
{{#pressCarouselMobile.items}}
{{> pressCarouselItem}}
{{/pressCarouselMobile.items}}
</div>
</div>
</div>
</div>
</div>
</div>
<div id="sponsors-section" class="gray-bg">
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="text-center">
Our <span class="frame-bg frame-bg-blue-lg">sponsors</span>
</h2>
<p class="text-center" id="your-note-text">
Thank you for your support!
</p>
<br />
<div class="text-center sponsors-org">
{{#sponsors.orgs}}
<a class="sponsor-org-item" href="{{url}}"><img title="{{title}}" src="{{imageBaseUrl}}/sponsors/{{imageName}}"></a>
{{/sponsors.orgs}}
</div>
<div class="text-center sponsors-github">
{{#sponsors.github}}
<div class="sponsor-github-item">
<a href="https://github.com/{{name}}" title="{{name}}">
<img width="50" src="https://avatars2.githubusercontent.com/u/{{id}}?s=96&amp;v=4">
</a>
</div>
{{/sponsors.github}}
</div>
<br />
</div>
</div>
</div>
</div>
<footer class="darkblue-bg">
<div class="container">
<div class="row">
<div class="col-3 d-none d-md-block">
<img src="{{imageBaseUrl}}/logo-text.svg" alt="" width="150" />
</div>
</div>
<div class="row">
<div class="col-12">
<hr />
</div>
</div>
<div class="row">
<div class="col-12 col-md-6">
<a href="{{baseUrl}}">
<img
src="{{imageBaseUrl}}/logo-text.svg"
width="120"
class="img-center d-block d-md-none"
alt=""
/>
</a>
<br class="d-block d-md-none" />
<p class="text-center-sm">Copyright &copy; 2016-{{yyyy}} Laurent Cozic</p>
</div>
<div class="col-12 col-md-6">
<p class="text-right text-center-sm right-links">
<a href="https://github.com/laurent22/joplin/" class="github-link"><i class="fab fa-github"></i> GitHub Repository</a>
<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
</p>
</div>
</div>
</div>
</footer>
</div>
<script
src="{{jsBaseUrl}}/bootstrap5.0.2.min.js"
rel="preload"
as="script"
></script>
<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
{{> analytics}}
</body>
</html>
@@ -0,0 +1,116 @@
<!DOCTYPE html>
<html lang="en">
<!--
!!! WARNING !!!
This file was auto-generated from {{{sourceMarkdownFile}}} and any manual change
made to it will be overwritten. To make a change to this file please modify
the source Markdown file:
https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
-->
<head>
{{> gaOptimize}}
<meta
charset="utf-8"
http-equiv="X-UA-Compatible"
content="IE=edge,chrome=1"
/>
<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Joplin, the open source note-taking application" />
<link
rel="stylesheet"
href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
as="style"
/>
<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
<link
href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
rel="stylesheet"
as="style"
media="all"
onload="this.media='all'; this.onload = null"
/>
<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
<title>{{pageTitle}}</title>
<script
src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
rel="preload"
as="script"
></script>
</head>
<body class="website-env-{{env}}">
<div class="container-fluid generic-template {{pageName}}-page" id="main-container">
{{#navbar}}
{{> navbar}}
{{/navbar}}
<div class="help-page-container page-{{sourceMarkdownName}}">
<div class="container">
<div class="row content-wrapper">
{{#showToc}}<div id="toc">{{{tocHtml}}}</div>{{/showToc}}
<div class="main-content">
<div class="alert alert-danger alert-env-dev" role="alert">
Running in {{env}} mode!
</div>
{{{contentHtml}}}
{{#showImproveThisDoc}}
<div class="bottom-links">
<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
<i class="fab fa-github"></i> Improve this doc
</a>
</div>
{{/showImproveThisDoc}}
</div>
</div>
</div>
</div>
<footer class="darkblue-bg">
<div class="container">
<div class="row">
<div class="col-3 d-none d-md-block">
<img src="{{imageBaseUrl}}/logo-text.svg" alt="" width="150" />
</div>
</div>
<div class="row">
<div class="col-12">
<hr />
</div>
</div>
<div class="row">
<div class="col-12 col-md-6">
<img
src="{{imageBaseUrl}}/logo-text.svg"
width="120"
class="img-center d-block d-md-none"
alt=""
/>
<br class="d-block d-md-none" />
<p class="text-center-sm">Copyright &copy; 2016-{{yyyy}} Laurent Cozic</p>
</div>
<div class="col-12 col-md-6 right-links">
<p class="text-right text-center-sm">
<a href="https://github.com/laurent22/joplin/" class="github-link"><i class="fab fa-github"></i> GitHub Repository</a>
<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
</p>
</div>
</div>
</div>
</footer>
</div>
<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
{{> analytics}}
</body>
</html>
@@ -0,0 +1,10 @@
<script>
if (window.location.hostname !== 'localhost') {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-103586105-1', 'auto');
ga('send', 'pageview');
}
</script>
@@ -0,0 +1,2 @@
<!-- Donate button A/B testing -->
<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
@@ -0,0 +1 @@
<a href="{{baseUrl}}/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a>
@@ -0,0 +1,70 @@
<div class="{{#isFrontPage}}navbar-frontpage blue-bg{{/isFrontPage}} {{^isFrontPage}}navbar-main white-bg{{/isFrontPage}}" id="nav-section">
<div class="container">
<div class="row">
<div class="col-3">
<a href="{{baseUrl}}/">
<img
src="{{#isFrontPage}}{{imageBaseUrl}}/logo-text.svg{{/isFrontPage}}{{^isFrontPage}}{{imageBaseUrl}}/logo-text-blue.svg{{/isFrontPage}}"
alt=""
id="top-logo"
width="180"
/>
</a>
</div>
<div class="col-9 text-right d-none d-md-block">
<a href="{{baseUrl}}/help/" class="fw500">Help</a>
<a href="{{forumUrl}}" class="fw500">Forum</a>
{{#showJoplinCloudLinks}}
{{> joplinCloudButton}}
{{/showJoplinCloudLinks}}
{{> supportButton}}
</div>
<div class="col-9 text-right d-block d-md-none">
<span class="pointer"
><img
src="{{#isFrontPage}}{{imageBaseUrl}}/mobile-menu-open-icon.png{{/isFrontPage}}{{^isFrontPage}}{{imageBaseUrl}}/mobile-menu-black-open-icon.png{{/isFrontPage}}"
id="open-menu-mobile"
alt=""
/></span>
&nbsp;&nbsp;
<div id="menu-mobile">
<div>
<div class="text-right">
<img
src="{{imageBaseUrl}}/close-icon.png"
alt=""
class="pointer"
id="close-menu-mobile"
/>
</div>
<div class="text-center menu-mobile-top">
<a href="{{forumUrl}}" class="fw500 mobile-menu-link">Forum</a>
<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
</div>
<div class="menu-mobile-buttons">
{{#showJoplinCloudLinks}}
{{> joplinCloudButton}}
{{/showJoplinCloudLinks}}
{{> supportButton}}
</div>
</div>
{{#showToc}}
<div id="toc-mobile">{{{tocHtml}}}</div>
{{/showToc}}
<div>
<p class="light-blue mobile-menu-link-bottom text-center">
Copyright &copy; 2016-{{yyyy}} Laurent&nbsp;Cozic
<br/>
<a href="{{baseUrl}}/privacy/" class="fw500">Privacy Policy</a>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -0,0 +1,71 @@
<div class="col-12 col-lg-4 account-type-{{priceMonthly.accountType}}">
<div class="price-container {{#featured}}price-container-blue{{/featured}}">
<div class="price-row">
<div class="plan-type">
<img src="{{imageBaseUrl}}/{{iconName}}.png"/>&nbsp;{{title}}
</div>
<div class="plan-price plan-price-monthly">
{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
</div>
<div class="plan-price plan-price-yearly">
{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
</div>
</div>
<div class="plan-price-yearly-per-year">
<div>
({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;/year</sub>)
</div>
</div>
{{#featuresOn}}
<p><i class="fas fa-check feature feature-on"></i>{{.}}</p>
{{/featuresOn}}
{{#featuresOff}}
<p class="unchecked-text"><i class="fas fa-times feature feature-off"></i>{{.}}</p>
{{/featuresOff}}
<p class="text-center subscribe-wrapper">
<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white subscribeButton">{{cfaLabel}}</a>
</p>
</div>
<script>
(function() {
const stripePricesIds = {
monthly: '{{{priceMonthly.id}}}',
yearly: '{{{priceYearly.id}}}',
};
const planName = '{{{name}}}';
const buttonId = 'subscribeButton-' + planName;
const buttonElement = document.getElementById(buttonId);
if (stripePricesIds.monthly) {
function handleResult() {
console.info('Redirected to checkout');
}
buttonElement.addEventListener("click", function(evt) {
evt.preventDefault();
const priceId = stripePricesIds[subscriptionPeriod];
if (!priceId) {
console.error('Invalid period: ' + subscriptionPeriod);
return;
}
createCheckoutSession(priceId).then(function(data) {
stripe.redirectToCheckout({
sessionId: data.sessionId
})
.then(handleResult);
});
});
}
})();
</script>
</div>
@@ -0,0 +1,22 @@
<div class="carousel-indicators">
<button
type="button"
data-bs-target="#{{id}}"
data-bs-slide-to="0"
class="active"
aria-current="true"
aria-label="Slide 1"
></button>
<button
type="button"
data-bs-target="#{{id}}"
data-bs-slide-to="1"
aria-label="Slide 2"
></button>
<button
type="button"
data-bs-target="#{{id}}"
data-bs-slide-to="2"
aria-label="Slide 3"
></button>
</div>
@@ -0,0 +1,23 @@
<div class="carousel-item {{active}} press-carousel" data-bs-interval="10000">
<img
src="{{imageBaseUrl}}/transparent-bg.png"
class="d-block w-100"
alt=""
/>
<div class="carousel-caption">
<img
src="{{imageBaseUrl}}/{{imageName}}"
alt=""
class="img-fluid img-center photo"
/>
<br />
<p class="text-center">
“{{body}}”
</p>
<br />
<p class="fw500 text-center">
<a href="{{url}}">{{source}}</a>
</p>
<p class="fw400 small text-center">By {{author}}</p>
</div>
</div>
@@ -0,0 +1,3 @@
<a class="button-link btn-blue sponsor-button" href="{{baseUrl}}/donate">
<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
</a>
@@ -0,0 +1,119 @@
<div id="plans-section" class="env-{{env}}">
<div class="container">
<div class="row">
<div class="col-12 title-box">
<h1 class="text-center">
Joplin Cloud <span class="frame-bg frame-bg-yellow">plans</span>
</h1>
<p class="text-center sub-title">
Joplin Cloud allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
</p>
</div>
</div>
<noscript>
<div class="alert alert-danger alert-env-dev" role="alert" style='text-align: center; margin-top: 10px;'>
To use this page please enable JavaScript!
</div>
</noscript>
<div style="display: flex; justify-content: center; margin-top: 1.2em">
<div class="form-check form-check-inline">
<input id="pay-monthly-radio" class="form-check-input" type="radio" name="pay-radio" checked value="monthly">
<label style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
Pay Monthly
</label>
</div>
<div class="form-check form-check-inline">
<input id="pay-yearly-radio" class="form-check-input" type="radio" name="pay-radio" value="yearly">
<label style="font-weight: bold" class="form-check-label" for="pay-yearly-radio">
Pay Yearly
</label>
</div>
</div>
<div class="row plan-group plan-prices-monthly">
{{#plans.basic}}
{{> plan}}
{{/plans.basic}}
{{#plans.pro}}
{{> plan}}
{{/plans.pro}}
{{#plans.business}}
{{> plan}}
{{/plans.business}}
</div>
<div class="row">
{{{faqHtml}}}
</div>
</div>
<script src="https://js.stripe.com/v3/"></script>
<script>
const urlQuery = new URLSearchParams(location.search);
let subscriptionPeriod = 'monthly';
var stripe = Stripe('{{{stripeConfig.publishableKey}}}');
let checkoutSessionUser = null;
// Temporary setup to allow Beta users to start their subscription.
function setupBetaHandling(query) {
let accountType = Number(query.get('account_type'));
if (isNaN(accountType)) accountType = 1;
const email = query.get('email');
if (!email) return;
$('.account-type-3').css('display', 'none');
$('.subscribeButton').text('Buy now');
if (accountType === 2) {
$('.account-type-1').css('display', 'none');
}
checkoutSessionUser = { email, accountType };
}
var createCheckoutSession = function(priceId) {
const coupon = urlQuery.get('coupon') || '';
console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
priceId: priceId,
coupon: coupon,
email: checkoutSessionUser ? checkoutSessionUser.email : '',
})
}).then(async function(result) {
if (!result.ok) {
console.error('Could not create Stripe checkout session', await result.text());
alert('The checkout session could not be created. Please contact support@joplincloud.com for support.');
} else {
return result.json();
}
});
};
$(() => {
$("input[name='pay-radio']").change(function() {
const period = $("input[type='radio'][name='pay-radio']:checked").val();
subscriptionPeriod = period;
$('.plan-group').removeClass(period === 'monthly' ? 'plan-prices-yearly' : 'plan-prices-monthly');
$('.plan-group').addClass('plan-prices-' + period);
});
setupBetaHandling(urlQuery);
});
</script>
</div>
Loaded 100 of 1845 files, more files were not shown because too many files have changed in this diff. Show more