1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Commit Graph

1287 Commits

Author SHA1 Message Date
Roman Musin
e57e5d3b3f
All: Fixes #5245: Bump hightlight.js to v11.2 (#5278) 2021-08-12 22:07: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