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

989 Commits (63f7349c17b379d0d5b1c919b11527c399ed01ad)

Author SHA1 Message Date
Laurent Cozic 6f27eae7dd Server v2.0.11 2021-06-15 12:41:59 +01:00
Laurent Cozic 85cc08c0d4 typo 2021-06-15 12:41:15 +01:00
Laurent Cozic ba38bf3490 Server v2.0.10 2021-06-15 12:28:05 +01:00
Laurent Cozic 2cf70675dc All: Fixed user content URLs when sharing note via Joplin Server 2021-06-15 12:25:55 +01:00
Laurent Cozic 58f8d7e1b4 Merge branch 'dev' into release-2.0 2021-06-15 11:53:51 +01:00
Helmut K. C. Tessarek b55b35e53f
Update translations 2021-06-14 11:38:21 -04:00
Michal Stanke c7194bf243
All: Translation: Update cs_CZ.po (#5074) 2021-06-14 10:55:23 -04:00
milotype 48abe2316e
All: Translation: Update hr_HR.po (#5073) 2021-06-13 18:02:08 -04:00
Laurent Cozic 7aca380cfa Desktop release v2.0.9 2021-06-12 10:00:27 +02:00
Laurent Cozic 551033f8ba Merge branch 'dev' into release-2.0 2021-06-12 10:00:04 +02:00
Ahmad Mamdouh 2af3bf61ea
All: Conflict notes will now populate a new field with the ID of the conflict note. (#5049) 2021-06-12 08:46:49 +01:00
Laurent Cozic 1aa70dd6b4 Generator: Include JSON files in webpack config 2021-06-12 00:18:33 +02:00
Laurent Cozic feaecf7653 Desktop, Mobile: Filter out form elements from note body to prevent potential XSS (thanks to Dmytro Vdovychinskiy for the PoC) 2021-06-11 20:17:45 +02:00
Laurent Cozic af9f3eedd3 Server v2.0.9 2021-06-11 18:49:29 +02:00
Laurent Cozic 815800827b Tools: Fixed Docker image version number 2021-06-11 18:34:16 +02:00
Laurent Cozic 8f1e3ba43c Server v2.0.8 2021-06-11 18:29:40 +02:00
Laurent Cozic 8459b46cd0 Tools: Allow building Docker image from CI 2021-06-11 18:24:59 +02:00
Nishant Mittal c5c38a323f
Desktop: Expose prompt to plugins as a command (#5058) 2021-06-11 00:26:16 +01:00
JackGruber 01e6ca4616
All: Fixes: Wrong field removed in API search (#5066) 2021-06-11 00:24:50 +01:00
Laurent Cozic 24a586c537 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-11 01:23:45 +02:00
Laurent Cozic 5d233a7387 Tools: Fixed tests 2021-06-11 01:15:43 +02:00
Helmut K. C. Tessarek 054e5428d5
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-06-10 19:06:15 -04:00
Laurent Cozic a36b13dcb4 Server: Handle custom user content URLs 2021-06-10 19:33:04 +02:00
Laurent Cozic b81c300907 Desktop release v2.0.8 2021-06-10 17:43:30 +02:00
Laurent Cozic 315216132f Desktop release v2.0.7 2021-06-10 17:04:09 +02:00
Laurent Cozic 2eaa821272 Merge branch 'dev' into release-2.0 2021-06-10 17:03:29 +02:00
Laurent Cozic 7c93e268e4 Tools: Fixed CI for macOS build 2021-06-10 17:02:52 +02:00
Laurent Cozic d0c4de92e2 Desktop release v2.0.6 2021-06-10 14:07:12 +02:00
Laurent Cozic 91ce465535 Desktop release v2.0.5 2021-06-10 14:06:09 +02:00
Laurent Cozic 4098c01e7c Merge branch 'dev' into release-2.0 2021-06-10 14:03:50 +02:00
Laurent Cozic 5fd6571bf1 Desktop: Allow restoring a delete note from note history using command palette 2021-06-10 11:49:20 +02:00
Laurent Cozic 00dc1d881b Desktop: Allow passing arguments to commands in command palette 2021-06-10 11:46:41 +02:00
Laurent Cozic c37eb56ed7 Tools: Fixed tests 2021-06-10 11:13:00 +02:00
Laurent Cozic b2b6ad479a Revert "Desktop: Make font size consistent between Markdown and Rich Text editors" 
This reverts commit a058e09183.

Reverts because this change means the settings are directly accessed
from the theme, which makes the themes unusable from Joplin Server.
 2021-06-10 10:59:15 +02:00
Laurent Cozic 0e4c545e14 Tools: Fixed tests 2021-06-10 10:57:45 +02:00
Laurent Cozic bbae1aef28 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-10 00:11:40 +02:00
Laurent Cozic cf86ffc36e Plugin Repo: Update stats every 7 days 2021-06-10 00:11:11 +02:00
Roman Musin 9d80a79cda
Android: Resolves #4216: Focus note editor where tapped instead of scrolling to the end (#4998) 2021-06-08 23:39:20 +01:00
Laurent Cozic ca487ade9a Desktop: Add "Retry all" button to sync status screen for items that could not be uploaded 2021-06-08 22:36:10 +02:00
Laurent Cozic 75b66a9fff Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-08 20:38:05 +02:00
Laurent Cozic 56fdf97693 Desktop: Fixes #5034: Certain resource paths could be corrupted when saved from the Rich Text editor 2021-06-08 20:37:44 +02:00
Subhra264 ce02a30441
Desktop, Mobile: Fixes #5025: Inline Katex gets broken when editing in Rich Text editor (#5052) 2021-06-08 19:23:10 +01:00
Laurent Cozic a058e09183 Desktop: Make font size consistent between Markdown and Rich Text editors 2021-06-08 20:21:11 +02:00
Laurent Cozic 594084e274 Server: Fixed error when creating user 2021-06-08 12:39:18 +02:00
Laurent Cozic 5614eb9442 Server: Added option to enable or disable stack traces 2021-06-08 12:08:40 +02:00
Laurent Cozic 7a3a2084db Server: Add navbar on login and sign up page 2021-06-08 11:48:58 +02:00
Laurent Cozic 95d7ccccea Desktop: Improved Joplin Server error handling 2021-06-08 01:34:33 +02:00
Laurent Cozic f7a7009b3c Server v2.0.6 2021-06-07 19:28:18 +02:00
Laurent Cozic de7579a14e Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-07 18:04:45 +02:00
Laurent Cozic c8d7ecbf6c Server: Add request duration to log 2021-06-07 16:27:09 +02:00
Laurent Cozic 3c41b45e8e Server: Check share ID when uploading a note 2021-06-07 16:17:52 +02:00
mbalint 62a371b9f3
All: Resolves #4613: Improve search with Asian scripts (#5018) 2021-06-07 15:15:04 +01:00
Laurent Cozic 5528ab7cc8 Tools: Fixed tests 2021-06-07 15:46:35 +02:00
JackGruber dd1c9e3c2a
All: Fixes #5007: Items are filtered in the API search (#5017) 2021-06-07 10:21:24 +01:00
Roman Musin 7c45b95f6f
Desktop: recreate http agent when the protocol changes (#5016) 2021-06-07 10:19:59 +01:00
Caleb John a7e67952b8
Plugins: Support executing codemirror commands from plugins when using execCommand (#5012) 2021-06-07 10:19:35 +01:00
Austin Doupnik 1b7d40387d
Desktop: Fixes #4877: Incorrect list renumbering (#4914) 2021-06-07 10:17:46 +01:00
Helmut K. C. Tessarek 7921e70c4f
macOS: add 'Hide Others' and 'Show All' menu items (#5024) 2021-06-06 23:49:44 +01:00
Laurent Cozic 23cfbc2367 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-06 19:14:48 +02:00
Laurent Cozic de45740129 Server: Load shared user content from correct domain 2021-06-06 19:14:12 +02:00
Helmut K. C. Tessarek a04d8ef441
Doc: fix text of terms and privacy (#5053) 2021-06-05 08:26:32 +01:00
Laurent Cozic db7b802803 Server: Add terms and privacy page 2021-06-04 18:09:09 +02:00
Laurent Cozic 75d79f373a Server: Added way to disable signup page, and added links between signup and login pages 2021-06-04 17:08:21 +02:00
Laurent Cozic e8a02c26d0 Desktop: Fixed: Ctrl+Clicking links in Rich Text editor was broken (regression) 2021-06-04 13:34:30 +02:00
Laurent Cozic 147b6b13ab package locks 2021-06-04 13:19:04 +02:00
Helmut K. C. Tessarek a496a3d90d
update en_US.po 2021-06-04 00:38:54 -04:00
Helmut K. C. Tessarek 69a8ada2ec
add new translation strings 2021-06-04 00:34:19 -04:00
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 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 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 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