Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,807 Commits
245 Branches
1,287 Tags
537 MiB
Commit Graph

1549 Commits (6242ac0339d5a54b83cc058b14ef52860fcf0e17)

Author SHA1 Message Date
Laurent Cozic 467bc7c455 Desktop, Cli: Fixes #5325: Fixed file paths when exporting as HTML 2021-08-17 07:05:31 +01:00
Laurent Cozic 4c99400485 Desktop, Cli: Fixes #5325: Fixed file paths when exporting as HTML 2021-08-17 07:00:54 +01:00
reportxx 4f3c832589
All: Translation: Update sv.po (#5317) 2021-08-16 17:33:33 -04:00
Laurent Cozic edc3496506 Tools: Fixed tests 2021-08-16 18:05:22 +01:00
Laurent Cozic be500f29cc Tools: Trying yet again to upgrade lock files to v2 2021-08-16 16:21:56 +01:00
Laurent Cozic f5f05e6cc5 All: Added "None" sync target to allow disabling synchronisation 2021-08-16 16:18:32 +01:00
Laurent Cozic fe4900d254 Desktop: Add Sync Wizard dialog 2021-08-16 15:20:14 +01:00
Laurent Cozic 5c50ee9b14 Merge branch 'release-2.3' into dev 2021-08-16 11:00:21 +01:00
Laurent Cozic 0aaf888aa5 CLI v2.3.2 2021-08-16 10:39:20 +01:00
Laurent Cozic 8c93a89c0a Tools: Fixed CLI release 2021-08-16 10:37:48 +01:00
Laurent Cozic bee6001462 Releasing sub-packages 2021-08-16 10:03:33 +01:00
Laurent Cozic dc192fb4c1 Android 2.3.4 2021-08-15 14:32:35 +01:00
Laurent Cozic 3abebe6a32 Tools: Fixed Android build 2021-08-15 14:10:52 +01:00
Roman 6c18c6ddc7 Use url-parse 2021-08-15 13:48:32 +01:00
Laurent Cozic fd78306111 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-15 12:22:46 +01:00
Laurent Cozic 2011369c83 ios-v12.3.1 2021-08-15 12:20:48 +01:00
Laurent Cozic 2a732ba03d Merge branch 'dev' into release-2.3 2021-08-15 12:15:28 +01:00
Laurent Cozic bcadb3662b Server: Increase cookies security - set HttpOnly, Secure and SameSite flags 2021-08-15 11:09:52 +01:00
Aaron 7b2c271070
Server: Fix missing CSS file error in DevTools (#5309) 2021-08-15 10:26:29 +01:00
Caleb John 9783f57f75
Desktop: Resolves #5297: Improved Markdown editor code styling, and add CSS classes for code (#5314) 
Adds the cm-jn-inline-code and cm-jn-code-block classes
both classes are given styling based on the current theme
 2021-08-15 10:25:47 +01:00
Laurent Cozic e0971baec4 Tools: Fixed tests 2021-08-15 00:54:24 +01:00
Laurent Cozic c7421dfbe1 Server: Fixed second duration 2021-08-15 00:39:28 +01:00
Laurent Cozic 543413d64b Server: Add request rate limter on session and login end points 2021-08-15 00:31:27 +01:00
Roman 20d1f74ee4 Use enum 2021-08-14 23:30:19 +01:00
Roman 2386abea3e Rename parseUrl -> parseCallbackUrl 2021-08-14 23:18:58 +01:00
Roman 90621a8417 Fix linter errors 2021-08-14 23:07:22 +01:00
Roman ee46978389 Review comments - throw an error if callback url is not valid 2021-08-14 21:59:54 +01:00
Roman 2b6b4dd916 Rename initialUrl -> initialCallbackUrl 2021-08-14 21:55:47 +01:00
Roman f0361bf80d Review comments - escape vars in url 2021-08-14 21:53:52 +01:00
Roman ecf718005d Code review comments 2021-08-14 21:01:03 +01:00
Roman 305d0ffc49 Rename copy folder URL -> copy notebook URL 2021-08-14 20:57:01 +01:00
Roman f454c4e33b Add a function to check for valid callback url 2021-08-14 20:20:16 +01:00
Roman 047883bd27 Read initial url from a field 2021-08-14 20:12:14 +01:00
Laurent Cozic 2c79ce25fa Server: Added commands to control db migrations - list, down, up 2021-08-14 17:49:01 +01:00
Laurent Cozic c8ccab808f Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-14 16:58:42 +01:00
Laurent Cozic d27f3b6ad3 Tools: Added option to push Docker images to DockerHub or not 2021-08-14 16:58:08 +01:00
Roman f118f5250f Handle openFolder and openTag too; change the URL format; extract ULR functions to a separate file 2021-08-14 13:33:45 +01:00
reportxx c8dad95c38
All: Translation: Update sv.po (#5301) 2021-08-14 08:28:22 -04:00
Minh-Phuc Bui 8646d8240b
All: Translation: Update vi.po (#5294) 
* Update vi.po

* Update Vietnamese translation

Remove unexpected whitespace
 2021-08-14 08:27:33 -04:00
Laurent Cozic 8063c94ff7 Desktop: Allow setting a max width for the editor content 2021-08-14 12:19:53 +01:00
Roman 61161039c8 Open the note from URL even if Joplin isn't running 2021-08-13 23:21:14 +01:00
Roman 00504898f2 Cleanup 2021-08-13 22:50:49 +01:00
Roman 0a6390ed96 Actually open the note 2021-08-13 22:45:13 +01:00
Laurent Cozic 6ae5ccb638 Server v2.3.7 2021-08-13 22:20:21 +01:00
Laurent Cozic 30a23ea118 Merge branch 'dev' into release-2.3 2021-08-13 22:20:05 +01:00
Laurent Cozic a9961ae3ec Server: Fix migrations 2021-08-13 22:19:20 +01:00
Roman f909fe6670 Trying to get it to work on Linux 2021-08-13 22:06:01 +01:00
Laurent Cozic d42d17e1ed Server v2.3.6 2021-08-13 21:59:45 +01:00
Laurent Cozic 60ef24a3f7 Merge branch 'dev' into release-2.3 2021-08-13 21:59:29 +01:00
Laurent Cozic f518549cfe Server: Fix migrations 2021-08-13 21:58:39 +01:00
Laurent Cozic d0ffc03ccc Server v2.3.5 2021-08-13 19:01:31 +01:00
Laurent Cozic 32c8cc9030 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-13 18:59:55 +01:00
Laurent Cozic d42d181f31 Server: Fixed pagination link styling 2021-08-13 18:59:45 +01:00
Laurent Cozic 48f23f1ee7 Tools: Build renderer assets 2021-08-13 17:58:03 +01:00
Laurent Cozic 58efe1c87f Merge branch 'release-2.3' into dev 2021-08-13 17:57:32 +01:00
Laurent Cozic 1478c368c5 Server v2.3.4 2021-08-13 17:57:06 +01:00
Laurent Cozic c96ec36d0d Server v2.3.3 2021-08-13 10:15:38 +01:00
Roman Musin e57e5d3b3f
All: Fixes #5245: Bump hightlight.js to v11.2 (#5278) 2021-08-12 22:07:57 +01:00
Laurent Cozic 6ce19ed680 Android 2.3.3 2021-08-12 21:57:37 +01:00
Roman b17d8bc533 Register to handle joplin:// links 2021-08-12 21:51:03 +01:00
Laurent Cozic d0251400a4 version 2021-08-12 21:32:54 +01:00
Laurent Cozic f0ad813f40 Tools: remove git pull from Android release script, which can make upload fail 2021-08-12 21:26:29 +01:00
Laurent Cozic f07636e4b7 Desktop release v2.3.3 2021-08-12 19:27:57 +01:00
Laurent Cozic 11cf8474f7 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-12 19:27:14 +01:00
Laurent Cozic 77a8ab8125 Tools: Fixed lib import statements 2021-08-12 19:26:35 +01:00
Laurent Cozic 3309f42fb6 Desktop release v2.3.2 2021-08-12 18:02:16 +01:00
Laurent Cozic bd907ddeb2 Tools: Trying again to upgrade lock files to v2 2021-08-12 18:01:55 +01:00
Laurent Cozic b6d9392798 Desktop release v2.3.1 2021-08-12 17:30:56 +01:00
Laurent Cozic f7e90490e9 Server v2.3.2 2021-08-12 17:26:58 +01:00
Laurent Cozic 14bf50fdc9 Tools: Fixed desktop test scripts 2021-08-12 17:25:19 +01:00
Laurent Cozic 97726b02e6 Server: Fixed publishing of notes with HTML markup type 2021-08-12 17:23:49 +01:00
Laurent dcd5a8d975
All: Improved E2EE usability by making its state a property of the sync target (#5276) 2021-08-12 16:54:10 +01:00
Laurent Cozic ba3cbfa051 Server v2.3.1 2021-08-12 16:50:56 +01:00
Laurent Cozic 9c37a3e5e4 Setup new release 2.3 2021-08-12 16:49:37 +01:00
Laurent Cozic 98d6aff275 Doc: Create page with info about Configuration Screen and added links to it 2021-08-12 16:20:56 +01:00
Laurent Cozic 5b1a970044 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-11 18:19:20 +01:00
Laurent Cozic aeb8b31b86 Server: Fixes #5269: Fixed layout of notes on mobile devices 2021-08-11 18:17:59 +01:00
小骏 c615b4245b
All: Translation: Update zh_CN.po (#5291) 2021-08-11 12:50:41 -04:00
Laurent Cozic b5f148c33a Re-apply package-lock v2 2021-08-11 17:34:17 +01:00
Laurent Cozic 3a22674c03 Merge branch 'release-2.2' into dev 2021-08-11 16:42:22 +01:00
Laurent Cozic 34d6742563 Revert "Tools: Upgrade package locks to v2" 
Revert because it's been done in release-2.2 and too much of a mess to
fix the conflicts.

This reverts commit 94232b667d.
 2021-08-11 16:41:38 +01:00
Laurent Cozic 252d65ebe1 CLI v2.2.2 2021-08-11 16:35:11 +01:00
Laurent Cozic 9ae2f07bd3 Releasing sub-packages 2021-08-11 16:29:31 +01:00
Laurent Cozic 15766d18f5 Cli: Fixed version command so that it does not require the keychain 2021-08-11 16:27:23 +01:00
Laurent Cozic a6030a40fa Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-11 16:26:01 +01:00
Laurent Cozic ca6d8ec1fa Cli: Fixed version command so that it does not require the keychain 2021-08-11 16:23:37 +01:00
Laurent Cozic 5526e5ca71 Android release v2.2.5 2021-08-11 11:45:00 +01:00
Laurent Cozic 6d1a2e2e1d Desktop release v2.2.7 2021-08-11 11:26:03 +01:00
Laurent Cozic 70cdaa3a22 Revert "Plugins: Add ability to make dialogs fit the application window (#5219)" 
This reverts commit c89037b4a2.

Ref: https://github.com/laurent22/joplin/pull/5219#issuecomment-896702259
 2021-08-11 11:25:14 +01:00
Laurent Cozic 6927335330 Revert: All: Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212) 
Revert commit d2e2866995

Ref: https://github.com/laurent22/joplin/issues/5287
 2021-08-11 11:24:01 +01:00
Laurent Cozic 94232b667d Tools: Upgrade package locks to v2 2021-08-10 22:58:45 +01:00
Laurent Cozic 77cdd3467d Server: Resolves #5286: Set better filename and mime type for files downloaded via published notes 2021-08-10 19:13:16 +01:00
Laurent Cozic 4b5318c6d0 Server: Re-enable account when subscription is paid 2021-08-10 18:21:15 +01:00
Laurent Cozic d8626919e0 Tools: Prevent multiple commits on Android releases 2021-08-10 18:02:20 +01:00
Laurent Cozic 6ed186a471 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-10 17:57:09 +01:00
Laurent Cozic a3b37ca59d Merge branch 'release-2.2' into dev 2021-08-10 16:56:26 +01:00
Laurent Cozic 895dd813df Releasing sub-packages 2021-08-10 15:45:08 +01:00
Laurent Cozic b90ec3af1e Tools: Update version numbers of sub-packages 2021-08-10 15:41:54 +01:00
Laurent Cozic 2ccbc87435 Tools: Also update dependency version numbers when creating a new release 2021-08-10 15:38:05 +01:00
Laurent Cozic d6eedc88c5 Doc: Update Plugin API intro 2021-08-10 12:17:03 +01:00
Laurent Cozic 11bd3d9e1f Merge branch 'release-2.2' into dev 2021-08-10 12:09:46 +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 6359c9ca98 Server: Fix regression 2021-08-09 22:22:31 +01:00
Laurent Cozic afb7e1a157 Mobile: Upgraded React Native to v0.64 2021-08-09 21:45:41 +01:00
Laurent Cozic 34d3e8f027 Android release v2.2.3 2021-08-09 19:35:43 +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 96c7a18d5b Doc: Update image links 2021-08-09 13:17:58 +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
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 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 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 785248b27f Server: Disable beta account once expired 2021-08-02 17:56:25 +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 ef35b30645 Doc: Switch to prod mode 2021-07-31 14:45:39 +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 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
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
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
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
milotype 9ac56b3754
All: Translation: Update hr_HR.po (#5206) 2021-07-19 10:37:27 -04:00
Laurent Cozic d4cdebafeb Doc: Automatic generation of responsive images 2021-07-19 14:37:59 +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 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
stephan11H 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 4ceca9e44c Doc: Clean up styling and bug fixes 2021-07-12 10:37:58 +01:00
Laurent Cozic 6a93cb289e Server: Moved email templates to separate files 2021-07-11 22:11:20 +01:00
Laurent Cozic 952b2b3427 Server v2.2.7 2021-07-11 18:32:05 +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 f761bad6bb Tools: Jest slow threshold 2021-07-11 16:30:50 +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 f8d2c26c8e Server: Disallow changing email address until a secure solution to change it is implemented 2021-07-11 11:35:49 +01:00
Laurent Cozic 67a000add9 Doc: Tweak welcome notes 2021-07-10 16:55:34 +01:00
Laurent Cozic f0c3a7313c Doc: Improved Welcome notes 2021-07-10 16:27:14 +01:00
Laurent Cozic 54130bb4af Doc: Fixed download page on mobile and other tweaks 2021-07-10 12:40:48 +01:00
Laurent Cozic e3db3871b6 Doc: Added cache buster timestamp to CSS and JS files 2021-07-10 11:29:18 +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 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