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

1615 Commits

Author SHA1 Message Date
Laurent Cozic
c2298213d7 Server: Improve flag logic 2021-09-15 12:06:01 +01:00
Abdunnasir Saeed
9679f03cfa
All: Translation: Update ar.po (#5464)
A complete Arabic translation
2021-09-15 06:39:50 -04:00
Laurent Cozic
3cddac3931 Server v2.4.6 2021-09-14 16:02:51 +01:00
Laurent Cozic
41c1e3bec9 Server: Fix transaction deadlock logging 2021-09-14 15:59:01 +01:00
Laurent Cozic
25c5892e74 Server v2.4.5 2021-09-14 13:02:56 +01:00
Laurent Cozic
a661a73511 Revert "Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338)"
This reverts commit ab134807ea.

Does not build:

https://github.com/laurent22/joplin/runs/3597996286?check_suite_focus=true#step:8:388
2021-09-14 13:01:33 +01:00
Laurent Cozic
b00959e143 Server v2.4.4 2021-09-14 12:16:47 +01:00
Laurent Cozic
f6f5d6808d Merge branch 'dev' into release-2.4 2021-09-14 12:07:04 +01:00
Laurent Cozic
01b653fc34 Server: Add transaction info to debug deadlock issues 2021-09-14 12:05:29 +01:00
Laurent Cozic
4e7fe66883 Server: Add link to Stripe subscription page to manage payment details 2021-09-13 12:30:36 +01:00
mrkaato
cd99e675d9
All: Translation: Update fi_FI.po (#5452) 2021-09-12 13:00:30 -04:00
Laurent Cozic
a7130ce17a Tools: Added script to compile SASS files 2021-09-12 16:35:08 +01:00
Laurent Cozic
20f8743079 Tools: Upgrade back package-lock files to v2 2021-09-12 16:34:03 +01:00
Laurent Cozic
660b53575e Doc: Update sponsors 2021-09-12 13:08:02 +01:00
Kenichi Kobayashi
6c43b78496
All: Fixes #5447: Plugin onNoteSelectionChange() is triggered twice after a search (#5449) 2021-09-12 11:40:14 +01:00
Helmut K. C. Tessarek
9d5d891fe3
Desktop, Mobile: Resolves #5295: Update Mermaid 8.10.2 -> 8.12.1 and fix gitGraph crash (#5448) 2021-09-11 19:47:01 +01:00
Laurent Cozic
96ac12b460 Chore: Converted encryption config screens to React Hooks to share logic between desktop and mobile 2021-09-10 19:05:47 +01:00
Laurent Cozic
4b93664240 Desktop release v2.4.6 2021-09-09 19:25:54 +01:00
Laurent Cozic
a2c6461af8 Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 19:24:52 +01:00
Laurent Cozic
d33b99cffb Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 18:46:58 +01:00
Laurent Cozic
267c32143b Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 18:42:00 +01:00
Laurent Cozic
9260b2a9ab Plugins: Add support for enabledConditions when creating menu item from command 2021-09-09 14:44:16 +01:00
Xavi Ivars
0a54854f54
All: Translation: Update ca.po (#5432)
* Update ca.po

* Update ca.po

A ton of improvements
2021-09-08 16:33:30 -04:00
Laurent Cozic
9ebec8c178 Cli: Fixes #5435: Setting note contents using "set" command does not update note timestamp 2021-09-08 10:32:44 +01:00
Laurent Cozic
6181250d86 Desktop release v2.4.5 2021-09-06 18:35:37 +01:00
Laurent Cozic
9407efd8ec All: Allow disabling any master key, including default or active one
Ref: https://discourse.joplinapp.org/t/syncing-error-with-joplin-cloud-and-e2ee-master-key-is-not-loaded/20115/5
2021-09-06 18:33:17 +01:00
Laurent Cozic
8996a0159a Lock file and TS error 2021-09-06 17:05:27 +01:00
Laurent Cozic
478d4accf1 Desktop: Load themes as CSS variables for use in custom themes and internal components 2021-09-06 16:57:07 +01:00
Laurent Cozic
80762572cf Chore: Moved app state to separate file 2021-09-04 18:11:29 +01:00
Marph
8e5d209d3c
All: Translation: Update de_DE.po (#5419) 2021-09-04 13:07:09 -04:00
reportxx
f71dad6d09
All: Translation: Update sv.po (#5418) 2021-09-04 12:05:59 -04:00
Laurent Cozic
f5891dfae8 Tools: Fixed build 2021-09-04 15:15:25 +01:00
Laurent Cozic
736bbbd8ed Plugins: Fixed import API
Ref: https://discourse.joplinapp.org/t/prompt-when-the-plugin-is-running-typeerror-this-module-oninit-is-not-a-function/20009/14
2021-09-04 15:07:38 +01:00
Laurent Cozic
973121addd Fixed missing command 2021-09-04 14:36:52 +01:00
Laurent Cozic
71c470f59d Desktop: Fixes #5417: Handle invalid search index in Goto Anything 2021-09-04 14:26:29 +01:00
Laurent Cozic
c529b972e3 Chore: Automatically create command index for desktop app 2021-09-04 13:43:25 +01:00
Laurent Cozic
e6bff3f2e0 Chore: Moved desktop app reducer to separate file so that it can be unit tested 2021-09-04 12:37:22 +01:00
Laurent Cozic
1bc674a1f9 Tools: Update ignored files when running desktop app in dev mode 2021-09-03 16:43:06 +01:00
Laurent Cozic
f371bb8e59 Revert "Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev"
This reverts commit 7c85889c1f, reversing
changes made to ab134807ea.

Reason: Messed up and accidentally merged a pull request.
2021-09-03 15:03:17 +01:00
Laurent Cozic
7c85889c1f Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev 2021-09-03 15:00:31 +01:00
Piotr Banasik
ab134807ea
Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338) 2021-09-03 14:54:10 +01:00
Laurent Cozic
8ab1cd984c Server v2.4.3 2021-09-02 18:49:29 +01:00
Laurent Cozic
e387d9a91b Merge branch 'dev' into release-2.4 2021-09-02 18:48:43 +01:00
Laurent Cozic
0793b1be59 Releasing sub-packages 2021-09-02 18:40:37 +01:00
Laurent Cozic
19225abbcf Android 2.4.1 2021-09-02 18:40:37 +01:00
Laurent Cozic
85fa3288ab Desktop release v2.4.4 2021-09-02 18:40:36 +01:00
Laurent Cozic
17f82c426a Chore: Added server test 2021-09-02 11:44:13 +01:00
Laurent Cozic
82331c9b93 Server: Display note title as page title when sharing note 2021-09-02 11:37:53 +01:00
Roman
886b6d1126 Add stuff to maybe get it to work on MacOS 2021-09-01 22:46:44 +01:00
Roman
1a703c4ecd Rename ProtocolUtils -> callbackUrlUtils 2021-09-01 22:28:33 +01:00
Roman
1126899769 Code review changes 2021-09-01 22:27:24 +01:00
Laurent Cozic
78c7b79299 Fixed margin 2021-09-01 12:47:35 +01:00
Laurent Cozic
d97ba57dda Desktop: Sort plugin results according to recommended property, and display Recommended tag 2021-09-01 12:17:20 +01:00
Laurent Cozic
9c44133bd0 Plugin Repo: Allow overridding manifest properties and added recommended plugins 2021-08-31 22:37:56 +01:00
Laurent Cozic
93a4ad09bb Server: Fixed calculation of max sizes for Postgres 2021-08-31 16:15:20 +01:00
Laurent Cozic
9c1dc7898a Doc: Add more links to FAQ 2021-08-31 15:39:02 +01:00
Laurent Cozic
6520a481ca Server: Added Help page for Joplin Cloud 2021-08-31 13:46:46 +01:00
Laurent Cozic
5805a41249 Server: Added icon next to profile button 2021-08-31 12:16:57 +01:00
Laurent Cozic
b88b747ba6 Api: Resolves #5199: Add support for "events" end point to retrieve info about latest note changes 2021-08-30 18:53:24 +01:00
Laurent Cozic
ce89ee5bab All: Add support for single master password, to simplify handling of multiple encryption keys 2021-08-30 14:15:35 +01:00
SiderealArt
596f679b1f
All: Translation: Update zh_TW.po (#5398) 2021-08-30 07:36:38 -04:00
Laurent Cozic
78d5fd1385 Server v2.4.2 2021-08-28 18:46:45 +01:00
Helmut K. C. Tessarek
0a98854e43
Update translations 2021-08-28 11:50:02 -04:00
Helmut K. C. Tessarek
a8a0dd2dd6
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-08-28 11:49:01 -04:00
Laurent Cozic
ad931a738f Desktop release v2.4.3 2021-08-28 15:52:09 +01:00
Laurent Cozic
3b6e6e45cf Desktop: Resolves #5161: Display link to browse plugins when repository cannot be reached 2021-08-28 15:45:27 +01:00
Laurent Cozic
dec0a08954 Desktop, Mobile: Fixes #5391: Fixed crash when a required master key does not exist 2021-08-28 15:36:05 +01:00
Roman
b269c2fdb9 Simplify protocol setup 2021-08-28 14:26:54 +01:00
Laurent Cozic
ad51090cdb Chore: Convert changelog tool to TypeScript 2021-08-28 10:49:31 +01:00
Laurent Cozic
75d118b19e Desktop release v2.4.2 2021-08-27 17:21:05 +01:00
Laurent Cozic
4c72de8bd8 Desktop: Fixes #5380: Prevent it from crashing with too long search queries 2021-08-27 17:16:09 +01:00
Laurent Cozic
d6da4299ad Desktop: Fixes #5346: "Move to notebook" would break with empty input 2021-08-27 16:58:42 +01:00
Laurent Cozic
f19c4ab434 Desktop: Allow specific deprecated plugins to still work 2021-08-27 16:34:39 +01:00
Laurent Cozic
70efaddeaf All: Do not display master key upgrade warnings for new master keys 2021-08-27 11:30:21 +01:00
Laurent Cozic
814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +01:00
Laurent Cozic
385b50d6ce Tools: Create test user with flag 2021-08-23 14:52:07 +01:00
Laurent Cozic
43943299f3 Server: Display user flags in profile when logged in as admin 2021-08-23 14:52:07 +01:00
Laurent Cozic
f11ba29112 Server v2.4.1 2021-08-23 14:51:28 +01:00
Arda Kılıçdağı
edf801a1ef
All: Translation: Update tr_TR.po (#5372) 2021-08-23 09:16:54 -04:00
小骏
f441177f7a
All: Translation: Update zh_CN.po (#5371) 2021-08-23 09:15:31 -04:00
Laurent Cozic
30c7410cbe Desktop release v2.4.1 2021-08-23 09:51:49 +01:00
Caleb John
4ba417a2f4
Desktop: Various improvements to Markdown import and export (#5290)
In preparation for #5224
2021-08-23 00:35:45 +01:00
Caleb John
e3bd24f819
Desktop: Resolves #5364: Disable inline code background in vim mode (#5370)
Also ensure that highlight marks are shown above inline code
2021-08-23 00:34:04 +01:00
Laurent Cozic
6e087bcb23 Server: Handle flags for accounts over limit 2021-08-22 13:10:29 +01:00
Laurent Cozic
f922e9a239 Server: Moved database types to separate file 2021-08-22 11:43:41 +01:00
Laurent Cozic
82b157b491 Server: Add support for user flags 2021-08-22 11:28:15 +01:00
Laurent Cozic
50f421c5d9 Tools: Setup release 2.4 2021-08-21 10:46:46 +01:00
Caleb John
a4785efd58
Desktop: Split code block class in two (#5359)
This makes it clear that once class controls the background
and the other controls the foreground
2021-08-21 10:34:54 +01:00
Roman
f42fd0ecce Fix enum usage 2021-08-20 21:43:37 +01:00
Roman
62c5f433d7 Rename enum values 2021-08-20 21:24:16 +01:00
Roman Musin
e73a4b7286
Merge branch 'dev' into desktop-protocol 2021-08-20 12:02:11 +01:00
Laurent Cozic
d6c4228a41 Tools: Move Android URL update to update-readme script 2021-08-20 11:37:12 +01:00
Helmut K. C. Tessarek
45e35576bd
update en_US.po 2021-08-19 08:08:55 -04:00
Helmut K. C. Tessarek
8eb1f7340b
Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-19 08:06:58 -04:00
Helmut K. C. Tessarek
2242cd2e4a
Update translations 2021-08-19 08:06:11 -04:00
Laurent Cozic
16b928a0f9 fixed imports 2021-08-19 13:02:54 +01:00
albanobattistella
351ddfe8a3
All: Translation: Update it_IT.po (#5347) 2021-08-19 07:49:51 -04:00
Laurent Cozic
ea99099b48 Update French translation and fix a few mistakes in code 2021-08-19 10:48:26 +01:00
Sailon Bispo
b257d620b7
All: Translation: Update bt_PR.po (#5340)
* Updating PT-BR Translate

* Fixing the three dots
2021-08-19 03:02:02 -04:00
Laurent Cozic
11d35711c1 Tools: Add linter rules for a few TypeScript naming conventions 2021-08-18 16:21:48 +01:00
Laurent Cozic
06ed58b809 All: Improved sync locks so that they do not prevent upgrading a sync target 2021-08-18 15:49:43 +01:00
Laurent Cozic
1efe3d3c6a Server: Prevent crash when returning too many rows using SQLite 2021-08-18 12:48:22 +01:00
Ahmad Mamdouh
9b27b3b1fb
Plugins: Resolves #5288: Improved support for fitToContent webview property (#5298) 2021-08-18 12:09:45 +01:00
JackGruber
d0313585be
Mobile: Show the used tags first in the tagging dialog (#5315) 2021-08-18 12:06:58 +01:00
Caleb John
189f9d1091
Desktop: Fixes #5327: Add more specific classes for CodeMirror elements (#5333)
Some themes use fairly specific classes so we need to overide them.

When changing notebooks, or when entering the editor from settings
the order that css is loaded changes in which case this bug wouldn't
manifest
2021-08-18 12:05:52 +01:00
Caleb John
352b78b5f7
Desktop: Removes markdown inline code padding (#5331)
Ref: https://github.com/laurent22/joplin/pull/5314#issuecomment-900256897
2021-08-18 12:03:34 +01:00
Laurent Cozic
4f5ad86028 Desktop: Fixes #5184: GotoAnything is not working on first try 2021-08-18 11:54:28 +01:00
Laurent Cozic
0cec4753d8 Server: Fixes #5328: Filenames with non-ascii characters could not be downloaded from published note 2021-08-17 23:29:46 +01:00
Laurent Cozic
51dbf885b7 Doc: Added sponsor 2021-08-17 14:19:37 +01:00
Laurent Cozic
ac82e4b074 Server: Re-enable account when new subscription is associated with it 2021-08-17 12:23:26 +01:00
Laurent Cozic
7faa58e0f9 All: Add a way to disable a master key 2021-08-17 12:03:19 +01:00
Laurent Cozic
ea1269d122 Merge branch 'release-2.3' into dev 2021-08-17 08:25:28 +01:00
Laurent Cozic
819af3c6d8 Desktop release v2.3.5 2021-08-17 07:14:59 +01:00
Caleb John
e51fe8bd80 Desktop: Place code-block background in the back in Markdown editor (#5322) 2021-08-17 07:14:30 +01:00
Caleb John
e159494231
Desktop: Place code-block background in the back in Markdown editor (#5322) 2021-08-17 07:13:52 +01:00
Laurent Cozic
4df434e63e Desktop release v2.3.4 2021-08-17 07:06:05 +01:00
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