self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
6,629 Commits 244 Branches 1,266 Tags 536 MiB
596f679b1f
Commit Graph

6629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
feda5afe44 Tools: Fixed server Dockerfile for Node 16 2021-08-13 17:55:50 +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
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
385e1270af Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-12 17:24:29 +01:00
Laurent Cozic
97726b02e6 Server: Fixed publishing of notes with HTML markup type 2021-08-12 17:23:49 +01:00
Laurent
81b440737d
Tools: Set node version to 16 on CI to fix build (#5296) 2021-08-12 17:21:57 +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
7f1de8df30 Doc: Fixed website button styling 2021-08-12 15:52:50 +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
8108af4e74 Android 2.2.5 2021-08-11 12:03:04 +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