1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-03 08:35:29 +02:00
Commit Graph

447 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Cozic
f5891dfae8 Tools: Fixed build 2021-09-04 15:15:25 +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
Laurent Cozic
85fa3288ab Desktop release v2.4.4 2021-09-02 18:40:36 +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
ce89ee5bab All: Add support for single master password, to simplify handling of multiple encryption keys 2021-08-30 14:15:35 +01: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
Roman
b269c2fdb9 Simplify protocol setup 2021-08-28 14:26:54 +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
814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +01:00
Laurent Cozic
30c7410cbe Desktop release v2.4.1 2021-08-23 09:51:49 +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
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 Musin
e73a4b7286
Merge branch 'dev' into desktop-protocol 2021-08-20 12:02:11 +01:00
Laurent Cozic
16b928a0f9 fixed imports 2021-08-19 13:02:54 +01:00
Laurent Cozic
11d35711c1 Tools: Add linter rules for a few TypeScript naming conventions 2021-08-18 16:21:48 +01:00
Ahmad Mamdouh
9b27b3b1fb
Plugins: Resolves #5288: Improved support for fitToContent webview property (#5298) 2021-08-18 12:09:45 +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
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
be500f29cc Tools: Trying yet again to upgrade lock files to v2 2021-08-16 16:21:56 +01:00
Laurent Cozic
fe4900d254 Desktop: Add Sync Wizard dialog 2021-08-16 15:20:14 +01:00