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

7042 Commits

Author SHA1 Message Date
Aaron
bd4714037c
Doc: Fix committer name in Joplin Server changelog (#5390)
Signed-off-by: Aaron <admin@datahoarder.dev>
2021-08-28 10:27:21 +01:00
Laurent Cozic
75d118b19e Desktop release v2.4.2 2021-08-27 17:21:05 +01:00
Laurent Cozic
9296b0ae36 Merge branch 'release-2.4' of github.com:laurent22/joplin into release-2.4 2021-08-27 17:19:31 +01:00
Arda Kılıçdağı
1862030cff All: Translation: Update tr_TR.po (#5372) 2021-08-27 17:18:26 +01:00
小骏
8a3eb8616e All: Translation: Update zh_CN.po (#5371) 2021-08-27 17:18:26 +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
da6a5e3bb8 Doc: Added CVE number for server CSRF vulnerability 2021-08-23 14:53:41 +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
1503a4e393 Merge branch 'release-2.4' of github.com:laurent22/joplin into release-2.4 2021-08-23 09:59:02 +01:00
Laurent Cozic
3ce23c75e6 Server v2.4.1 2021-08-23 09:58:00 +01:00
Laurent Cozic
5dd8862380 Server v2.4.1 2021-08-23 09:54:12 +01:00
Laurent Cozic
091945d9d6 Merge branch 'release-2.4' of github.com:laurent22/joplin into release-2.4 2021-08-23 09:52:25 +01:00
Laurent Cozic
30c7410cbe Desktop release v2.4.1 2021-08-23 09:51:49 +01:00
Piotr Banasik
9b2094f688
Server: Switch to node:16-bullseye base image (#5202)
This uses newer libs which are needed to build some of the dependencies which are not available pre-built on non-amd64 architectures.

Also to instal sqlite from source python seems to be needed.
2021-08-23 09:51:26 +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
84d95c6dcb
Doc: Add more pull request guidelines 2021-08-22 22:10:59 +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
Trent Larson
2ae51acd29
Doc: grammar fix (#5366) 2021-08-22 10:37:55 +01:00
Laurent Cozic
da6cb5616e Desktop release v2.4.1 2021-08-21 10:48:31 +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
Piotr Banasik
5d88a303dd
Server: No longer install vim into the image since its not needed to run things (#5337) 2021-08-20 12:14:53 +01:00
Roman Musin
e73a4b7286
Merge branch 'dev' into desktop-protocol 2021-08-20 12:02:11 +01:00
Laurent Cozic
53bad3a768 Update website 2021-08-20 11:38:05 +01:00
Laurent Cozic
d6c4228a41 Tools: Move Android URL update to update-readme script 2021-08-20 11:37:12 +01:00
Laurent Cozic
ee0b34156c Update website 2021-08-20 11:11:35 +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