Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,117 Commits
246 Branches
1,287 Tags
540 MiB
Commit Graph

6 Commits (240f9a3ff03f37aeb60804632d209aced7e0986b)

Author SHA1 Message Date
Henry Heino e7014492c5
Desktop: Fixes #8661: Fix note editor blank after syncing an encrypted note with remote changes (#8666) 2023-08-18 09:31:45 +01:00
Laurent Cozic 7d0b7122f0 Revert "Desktop: Fixes #8661: Fix note editor blank after syncing an encrypted note with remote changes (#8665)" 
This reverts commit 85eddbfe22.

Due to useForm conflicts with https://github.com/laurent22/joplin/pull/8654
 2023-08-14 18:38:31 +01:00
Henry Heino 85eddbfe22
Desktop: Fixes #8661: Fix note editor blank after syncing an encrypted note with remote changes (#8665) 2023-08-14 18:21:41 +01:00
Laurent Cozic 887c271853
Chore: Trying to fix logger (#8610) 2023-08-04 10:57:54 +01:00
Laurent Cozic 5edbdb2466 Fix tests 2023-07-28 10:46:40 +01:00
Henry Heino a0ec928fca
Merge pull request from GHSA-m59c-9rrj-c399 
* Sanitize HTML in processPastedHtml

* Add test
 2023-07-27 15:41:57 +01:00