1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Commit Graph

4993 Commits

Author SHA1 Message Date
Laurent Cozic
4c948408c4 Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-11-04 12:03:09 +00:00
Laurent Cozic
cc3a1d78da Merge branch 'dev' into release-1.3 2020-11-04 12:02:38 +00:00
Laurent Cozic
0cc544a95f Android release v1.3.11 2020-11-04 11:58:36 +00:00
Laurent Cozic
03b7402dc5 Electron release v1.3.15 2020-11-04 11:44:33 +00:00
Laurent Cozic
dd5c400c24 Electron release v1.3.14 2020-11-04 11:44:04 +00:00
Laurent Cozic
abc702c21f Electron release v1.3.12 2020-11-04 11:43:40 +00:00
Laurent Cozic
cc3e1bdee8 Mobile: Fixed Katex rendering 2020-11-04 11:36:44 +00:00
Laurent Cozic
10cfa773ca Mobile: Fixes #4033: Fixed clicking on links 2020-11-04 11:35:12 +00:00
Laurent Cozic
8dc42b1f41 Revert "Desktop: Fixed handling of Option key for shortcuts in macOS"
This reverts commit e4f53a48d2.

Causes other issues like this one, so it needs to be removed:

https://github.com/laurent22/joplin/issues/4032
2020-11-04 10:37:07 +00:00
Ji-Hyeon Gim
6e7ea9a549
All: Translation: Update ko.po (#4018)
It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2020-11-01 19:48:19 -05:00
Laurent Cozic
ed2ccdd504 Merge branch 'dev' of https://github.com/laurent22/joplin into dev 2020-11-01 00:11:09 +00:00
Laurent Cozic
6d2bad01e6 Merge branch 'release-1.3' into dev 2020-10-31 16:49:50 +00:00
Laurent Cozic
3847831d80 Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3 2020-10-31 16:45:17 +00:00
Robin
44462f4d71
All: Translation: Update nl_NL.po (#4012) 2020-10-31 12:38:54 -04:00
Laurent Cozic
4d20589773 Desktop: Remove from keymap editor commands that cannot be associated with a shortcut 2020-10-31 16:29:17 +00:00
Laurent Cozic
52140ec1a9 Merge branch 'release-1.3' into dev 2020-10-31 13:06:06 +00:00
Laurent Cozic
08c2a7ad64 Tools: Improved HTML escape in git-changelog 2020-10-31 13:05:46 +00:00
Laurent Cozic
d19796f14c Electron release v1.3.11 2020-10-31 13:02:14 +00:00
Laurent Cozic
e4f53a48d2 Desktop: Fixed handling of Option key for shortcuts in macOS 2020-10-31 13:01:40 +00:00
Laurent Cozic
154163bd6c Desktop: Fixes #4010: Add history backward and forward commands to keymap and menus 2020-10-31 12:46:55 +00:00
Laurent Cozic
4502414934 Desktop: Make sure all commands appear in keymap editor 2020-10-31 12:25:12 +00:00
Laurent Cozic
38e4bc61d9 Doc: Plugin doc 2020-10-30 18:50:04 +00:00
Laurent Cozic
86c471afcd Cli: Fixes #4000: Display proper error message when decryption worker cannot be started 2020-10-29 23:37:19 +00:00
Laurent Cozic
e2698aaead Merge branch 'release-1.3' into dev 2020-10-29 17:10:48 +00:00
Laurent Cozic
8cfe4b0f82 Mobile: Disable beta editor for now due to bugs that cannot be fixed
and crashes.

See https://discourse.joplinapp.org/t/11658/9?u=laurent
2020-10-29 16:42:47 +00:00
Laurent Cozic
fd90a490c0 All: Security: Remove "link" and "meta" tags from notes to prevent XSS 2020-10-29 16:19:56 +00:00
Helmut K. C. Tessarek
16c5ffadc7
Update translations 2020-10-29 10:34:31 -04:00
Laurent Cozic
4a184721e4 Doc: Restored privacy policy document 2020-10-29 13:49:12 +00:00
Laurent Cozic
1e3bd937ed Android release v1.3.10 2020-10-29 11:34:10 +00:00
Laurent Cozic
0f6932f1e8 Clipper release v1.3.1 2020-10-29 11:28:21 +00:00
Laurent Cozic
cab98776db Electron release v1.3.10 2020-10-29 11:20:45 +00:00
Laurent Cozic
fbc1e3ed3b Merge branch 'dev' into release-1.3 2020-10-29 11:18:32 +00:00
Ji-Hyeon Gim
805d16abda
All: Translation: Update ko.po (#3995)
It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2020-10-29 11:18:01 +00:00
Eduardo Braga
f133229287
Add some missing translations to pt_BR.po (#3994) 2020-10-29 11:16:18 +00:00
Mario Campo
8f4031572a
Update es_ES.po (#3978)
Several corrections in spanish language
2020-10-29 11:15:53 +00:00
Laurent Cozic
d25fa796c0 Api: Added service to access resource external editing 2020-10-29 11:09:18 +00:00
Laurent Cozic
089d6a5c9e All: Fixes #3993: Fix slow Katex rendering when there are many global definitions 2020-10-29 10:44:48 +00:00
Laurent Cozic
3f83355d9f Clipper: Fixes #3984: Images from some website were not being downloaded 2020-10-29 10:16:31 +00:00
Laurent Cozic
40380e3066 Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3 2020-10-29 10:15:08 +00:00
Laurent Cozic
a6748bafb3 All: Fixes #3992: Update highlight.js to fix freeze for certain code blocks 2020-10-28 17:31:54 +00:00
Laurent Cozic
b52f6eb77c All: Fixes #3955: Fixed sync issue when importing ENEX files that contain new line characters in the source URL attribute 2020-10-28 17:21:41 +00:00
Laurent Cozic
98c933fdb7 All: Fixed OneDrive authentication 2020-10-28 15:50:34 +00:00
Laurent Cozic
ece7ffadd6 Desktop: Fixes #3986: Handle gzipped CSS files when importing from clipper 2020-10-28 15:47:36 +00:00
Laurent Cozic
591bceb8ef Update mermaid 2020-10-28 12:10:35 +00:00
Laurent Cozic
04cfd07176 macOS: Regression: Restore Edit menu in config screens so that Copy/Cut/Paste shortcuts work 2020-10-28 11:23:57 +00:00
Laurent Cozic
db2282a351 Desktop: Fix syntax of imported resources when importing ENEX as HTML 2020-10-28 11:11:04 +00:00
Laurent Cozic
0ec3d6ca9d Clipper: Upgraded clipper to support API pagination
This version of the clipper will support both new and old Joplin
clients, so as to ease the transition.
2020-10-27 00:38:39 +00:00
Laurent Cozic
442b7ce0d3 litner 2020-10-26 23:19:52 +00:00
Laurent Cozic
6a068a90b2 Desktop: Regression: Keyboard shortcut would not save in some cases 2020-10-25 17:46:41 +00:00
Laurent Cozic
9a6f6c8b39 Desktop: Regression: Restore "New sub-notebook" command 2020-10-25 17:29:52 +00:00