diff --git a/BUILD.md b/BUILD.md index 2526e1af3..9d0ce597f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -87,6 +87,10 @@ It still requires you to quit the application each time you want it to rebuild, 2. Switch to the Electron app and cmd+Q to quit it. 3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter). +# Updating Markdown renderer packages + +The Markdown renderer is located under ReactNativeClient/lib/joplin-renderer. Whenever updating one of its dependencies, such as Mermaid or Katex, please run `npm run buildAssets` to make sure all assets such as fonts or CSS files are deployed correctly. + # Troubleshooting Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/master/readme/build_troubleshooting.md) for various tips on how to get the build working. \ No newline at end of file diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json index 21a194635..d6f44bbad 100644 --- a/CliClient/package-lock.json +++ b/CliClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "joplin", - "version": "1.0.166", + "version": "1.0.167", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/CliClient/package.json b/CliClient/package.json index dbe9f9e71..68a34feaa 100644 --- a/CliClient/package.json +++ b/CliClient/package.json @@ -28,7 +28,7 @@ ], "owner": "Laurent Cozic" }, - "version": "1.0.166", + "version": "1.0.167", "bin": { "joplin": "./main.js" }, diff --git a/ElectronClient/package-lock.json b/ElectronClient/package-lock.json index 1d7947cd6..2a0e6416d 100644 --- a/ElectronClient/package-lock.json +++ b/ElectronClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "Joplin", - "version": "1.0.239", + "version": "1.0.241", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/ElectronClient/package.json b/ElectronClient/package.json index e69b4647f..2bdd07586 100644 --- a/ElectronClient/package.json +++ b/ElectronClient/package.json @@ -1,6 +1,6 @@ { "name": "Joplin", - "version": "1.0.239", + "version": "1.0.241", "description": "Joplin for Desktop", "main": "main.js", "scripts": { diff --git a/README.md b/README.md index d609c43aa..aa6d39a8a 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a Operating System | Download | Alternative -----------------|--------|------------------- -Windows (32 and 64-bit) | Get it on Windows | Or get 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. -macOS | Get it on macOS | You can also use Homebrew (unsupported): `brew cask install joplin` -Linux | Get it on Linux | An Arch Linux package (unsupported) [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:

`wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash` +Windows (32 and 64-bit) | Get it on Windows | Or get 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. +macOS | Get it on macOS | You can also use Homebrew (unsupported): `brew cask install joplin` +Linux | Get it on Linux | An Arch Linux package (unsupported) [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:

`wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash` ## Mobile applications diff --git a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj index 543125c9f..67c856142 100644 --- a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj +++ b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj @@ -337,7 +337,7 @@ CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( @@ -357,7 +357,7 @@ INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 10.0.52; + MARKETING_VERSION = 10.0.53; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -380,7 +380,7 @@ CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -393,7 +393,7 @@ INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 10.0.52; + MARKETING_VERSION = 10.0.53; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid_render.js b/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid_render.js index ed0e77026..bed3f3132 100644 --- a/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid_render.js +++ b/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid_render.js @@ -18,7 +18,7 @@ function mermaidInit() { // Resetting elements size - see mermaid.ts const elements = document.getElementsByClassName('mermaid'); for (const element of elements) { - element.style.width = 'fit-content'; + element.style.width = '100%'; } } } diff --git a/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js b/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js index 52bc065c0..bed3f3132 100644 --- a/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js +++ b/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js @@ -15,6 +15,7 @@ function mermaidInit() { console.error('Mermaid error', error); } + // Resetting elements size - see mermaid.ts const elements = document.getElementsByClassName('mermaid'); for (const element of elements) { element.style.width = '100%'; diff --git a/Tools/git-changelog.js b/Tools/git-changelog.js index 6c0831211..7832006cc 100644 --- a/Tools/git-changelog.js +++ b/Tools/git-changelog.js @@ -248,7 +248,9 @@ function capitalizeFirstLetter(string) { function decreaseTagVersion(tag) { const s = tag.split('.'); - let num = Number(s.pop()); + const lastToken = s.pop(); + const s2 = lastToken.split('-'); + let num = Number(s2[0]); num--; if (num < 0) throw new Error(`Cannot decrease tag version: ${tag}`); s.push(`${num}`); diff --git a/docs/changelog/index.html b/docs/changelog/index.html index 8475850ce..edcc31da7 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -351,6 +351,121 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md

Joplin changelog🔗

+

v1.0.241 - 2020-09-04T18:06:00Z🔗

+

This release will ask you to upgrade your sync target and, once it is done, only the latest clients will be able to sync with this sync target. So please make sure you upgrade your other clients too (mobile, cli, etc.).

+

This version also includes an update to the search engine and as a result starting the app the first might be SLOW, as the search engine indexes all your notes. It might take from a few seconds to several minutes depending on how large your note collection is. This is a one off operation.

+ +

v1.0.239 - 2020-09-01T21:56:36Z🔗

+

IMPORTANT: This pre-release will ask you to upgrade your sync target and, once it is done, only the latest clients will be able to sync with this sync target. Currently that includes the desktop app (v1.0.234+) and Android app (v1.0.337+). It means if you are using these two clients you'll be fine. However if you are using the iOS or CLI clients you might want to wait till these clients are updated. Any issue with the sync target upgrade, please post on the forum.

+

This version also includes an update to the search engine and as a result starting the app the first might be SLOW, as the search engine indexes all your notes. It might take from a few seconds to several minutes depending on how large your note collection is.

+

Regression fixes:

+ +

Main changes:

+ +

v1.0.237 - 2020-08-29T15:38:04Z🔗

+

IMPORTANT: This pre-release will ask you to upgrade your sync target and, once it is done, only the latest clients will be able to sync with this sync target. Currently that includes the desktop app (v1.0.234+) and Android app (v1.0.337+). It means if you are using these two clients you'll be fine. However if you are using the iOS or CLI clients you might want to wait till these clients are updated. Any issue with the sync target upgrade, please post on the forum.

+

This version also includes an update to the search engine and as a result starting the app the first might be SLOW, as the search engine indexes all your notes. It might take from a few seconds to several minutes depending on how large your note collection is.

+

Regression fixes:

+ +

Main changes:

+ +

v1.0.236 - 2020-08-28T09:16:54Z🔗

+

IMPORTANT: This pre-release will ask you to upgrade your sync target and, once it is done, only the latest clients will be able to sync with this sync target. Currently that includes the desktop app (v1.0.234+) and Android app (v1.0.337+). It means if you are using these two clients you'll be fine. However if you are using the iOS or CLI clients you might want to wait till these clients are updated. Any issue with the sync target upgrade, please post on the forum.

+

This version also includes an update to the search engine and as a result starting the app the first might be SLOW, as the search engine indexes all your notes. It might take from a few seconds to several minutes depending on how large your note collection is.

+

Regression fixes:

+ +

Main changes:

+

v1.0.235 - 2020-08-18T22:08:01Z🔗

Important: This pre-release will ask you to upgrade your sync target and, once it is done, only the latest clients will be able to sync with this sync target. Currently that includes the desktop app (v1.0.234+) and Android app (v1.0.337+). It means if you are using these two clients you'll be fine. However if you are using the iOS or CLI clients you might want to wait till these clients are updated. Any issue with the sync target upgrade, please post on the forum.

This version also includes an update to the search engine and as a result starting the app the first might be SLOW, as the search engine indexes all your notes. It might take from a few seconds to several minutes depending on how large your note collection is

diff --git a/docs/changelog_cli/index.html b/docs/changelog_cli/index.html index fb08c3f7b..b888bdc9b 100644 --- a/docs/changelog_cli/index.html +++ b/docs/changelog_cli/index.html @@ -351,6 +351,15 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md

Joplin terminal app changelog🔗

+

cli-v1.0.167 - 2020-09-04T17:15:49Z🔗

+

cli-v1.0.166 - 2020-08-02T14:03:26Z🔗