diff --git a/README.md b/README.md index 1a6b01cb3..20c9d8462 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,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: `brew cask install joplin` -Linux | Get it on Linux | An Arch Linux package [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), 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: `brew cask install joplin` +Linux | Get it on Linux | An Arch Linux package [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), 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/docs/api/index.html b/docs/api/index.html index 795a490f2..aa3b5b0cd 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -332,8 +332,12 @@ https://github.com/laurent22/joplin/blob/master/readme/api.md +

22:24:32 Profile directory: /Users/laurent/Temp/TestNotes2
+22:24:32 Trying to load 1 master keys...
+22:24:32 Loaded master keys: 0
+22:24:32 ResourceFetcher: Auto-add resources: Mode: always
+22:24:32 ResourceFetcher: Auto-added resources: 0

Joplin API🔗

-

When the Web Clipper service is enabled, Joplin exposes a REST API which allows third-party applications to access Joplin's data and to create, modify or delete notes, notebooks, resources or tags.

In order to use it, you'll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port 41184. If you want to find it programmatically, you may follow this kind of algorithm:

let port = null;
 for (let portToTest = 41184; portToTest <= 41194; portToTest++) {
diff --git a/docs/changelog/index.html b/docs/changelog/index.html
index 4e2ce8f30..94c789077 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -333,6 +333,38 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md
 
 
 
Joplin changelog🔗

+
v1.0.195 - 2020-03-22T19:56:12Z🔗

+
+
v1.0.194 - 2020-03-14T00:00:32Z🔗

+
The main purpose of this pre-release is to allow evaluating the WYSIWYG editor.

+
 
v1.0.193 - 2020-03-08T08:58:53Z🔗