diff --git a/README.md b/README.md index b9f21ef38..2eef0aa54 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ Three types of applications are available: for **desktop** (Windows, macOS and L Operating System | Download ---|--- -Windows (32 and 64-bit) | Get it on Windows -macOS | Get it on macOS -Linux | Get it on Linux +Windows (32 and 64-bit) | Get it on Windows +macOS | Get it on macOS +Linux | Get it on Linux -**On Windows**, you may also use the Portable version. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. +**On Windows**, you may also use the Portable version. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too: diff --git a/readme/changelog.md b/readme/changelog.md index a14499ad0..9fa4e1d6b 100644 --- a/readme/changelog.md +++ b/readme/changelog.md @@ -1,5 +1,11 @@ # Joplin changelog +## [v2.10.19](https://github.com/laurent22/joplin/releases/tag/v2.10.19) - 2023-05-17T12:25:41Z + +- Improved: Improved handling of items with duplicate IDs when synchronising with Joplin Cloud or Server ([d4c43a8](https://github.com/laurent22/joplin/commit/d4c43a8)) +- Security: Fixed possible XSS injection ([b26bc9e](https://github.com/laurent22/joplin/commit/b26bc9e)) (Discovery and PoC by [@maple3142](https://twitter.com/maple3142)) +- Security: Prevent XSS and potential RCE when using a special HTML tag ([19bdda2](https://github.com/laurent22/joplin/commit/19bdda2)) (Discovery and PoC by [Yaniv Nizry](https://twitter.com/YNizry) ([SonarSource](https://www.sonarsource.com/))) + ## [v2.11.4](https://github.com/laurent22/joplin/releases/tag/v2.11.4) (Pre-release) - 2023-05-16T10:02:21Z - Fixed: Fix slow startup time ([#8087](https://github.com/laurent22/joplin/issues/8087)) diff --git a/readme/download.md b/readme/download.md index 178b75800..1b36957e0 100644 --- a/readme/download.md +++ b/readme/download.md @@ -10,7 +10,7 @@ Your download of Joplin is in progress. Access your notes on Windows, macOS or Linux. -Get it on Windows Get it on macOS Get it on Linux +Get it on Windows Get it on macOS Get it on Linux