diff --git a/README.md b/README.md index ae05e8002..c790f2c0b 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
(to run from a USB key, etc.) -macOS | Get it on macOS | -Linux | Get it on Linux | An Arch Linux package
[is also available](#terminal-application). +Windows (32 and 64-bit) | Get it on Windows | or Get the Portable version
(to run from a USB key, etc.) +macOS | Get it on macOS | +Linux | Get it on Linux | An Arch Linux package
[is also available](#terminal-application). 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. diff --git a/Tools/build-all.sh b/Tools/build-all.sh index 6b0be9111..f2661241e 100644 --- a/Tools/build-all.sh +++ b/Tools/build-all.sh @@ -1,4 +1,4 @@ #!/bin/bash ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -"$ROOT_DIR/CliClient/run.sh" apidoc > "$ROOT_DIR/readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push \ No newline at end of file +"$ROOT_DIR/../CliClient/run.sh" apidoc > "$ROOT_DIR/../readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push \ No newline at end of file diff --git a/docs/api/index.html b/docs/api/index.html index 10dc97b13..5fedc9094 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -617,16 +617,6 @@ for (let portToTest = 41184; portToTest <= 41194; portToTest++) { int - -fetch_status -int - - - -fetch_error -text - -

GET /resources

diff --git a/docs/changelog/index.html b/docs/changelog/index.html index f3c28a69e..522a2f9db 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -251,6 +251,23 @@

Joplin changelog

+

v1.0.115 - 2018-11-16T16:52:02Z

+

This is a rather large release which includes many of the pull requests that were submitted during Hacktoberfest, plus some extra improvements and bug fixes. Many thanks to all the contributors!

+

v1.0.114 - 2018-10-24T20:14:10Z

-

v1.0.67 - 2018-02-19T22:51:08Z

-