From b44a2075a8f111d27b598bc3e390ea4d1f378128 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sun, 8 Mar 2020 09:06:07 +0000 Subject: [PATCH] Update website --- README.md | 6 +- ReactNativeClient/lib/welcomeAssets.js | 2 +- docs/api/index.html | 4 - docs/changelog/index.html | 94 +++++++- docs/changelog_cli/index.html | 10 + docs/index.html | 115 ++++++---- docs/stats/index.html | 306 ++++++++++++++----------- readme/api.md | 5 - readme/changelog.md | 97 +++++++- readme/stats.md | 112 ++++----- 10 files changed, 504 insertions(+), 247 deletions(-) diff --git a/README.md b/README.md index 4e595a67a..2a3651db7 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/ReactNativeClient/lib/welcomeAssets.js b/ReactNativeClient/lib/welcomeAssets.js index e0e11b778..66993b343 100644 --- a/ReactNativeClient/lib/welcomeAssets.js +++ b/ReactNativeClient/lib/welcomeAssets.js @@ -49,7 +49,7 @@ module.exports = { { "id": "5ec2e7505ec2e7505ec2e7505ec2e750", "title": "5. Privacy", - "body": "# Privacy\n\nJoplin values your privacy and security by giving you complete control over your information and digital footprint.\n\nJoplin applications do not send any data to any service without your authorisation. Any data that Joplin saves, such as notes or images, are saved to your own device and you are free to delete this data at any time.\n\nJoplin has many modern features, some of which use third-party services. You can disable any or all of these features in the application settings. These features are:\n\n|Feature | Description | Default|\n|--------|-------------|---------|\n|Auto-update|Joplin periodically connects to GitHub to check for new releases.|Enabled|\n|Geo-location|Joplin saves geo-location information in note properties when you create a note.|Enabled|\n|Synchronisation|Joplin supports synchronisation of your notes across multiple devices. If you choose to synchronise with a third-party, such as OneDrive, the notes will be sent to your OneDrive account, in which case the third-party privacy policy applies.|Disabled|\n\nJoplin is developed as an open-source application and the source code is freely available online to inspect.\n\nFor any question about Joplin privacy, please leave a message on the [Joplin Forum](https://discourse.joplinapp.org/).\n", + "body": "# Privacy\n\nJoplin values your privacy and security by giving you complete control over your information and digital footprint.\n\nJoplin applications do not send any data to any service without your authorisation. Any data that Joplin saves, such as notes or images, are saved to your own device and you are free to delete this data at any time.\n\nJoplin has many modern features, some of which use third-party services. You can disable any or all of these features in the application settings. These features are:\n\n|Feature | Description | Default|\n|--------|-------------|--------|\n|Auto-update|Joplin periodically connects to GitHub to check for new releases.|Enabled|\n|Geo-location|Joplin saves geo-location information in note properties when you create a note.|Enabled|\n|Synchronisation|Joplin supports synchronisation of your notes across multiple devices. If you choose to synchronise with a third-party, such as OneDrive, the notes will be sent to your OneDrive account, in which case the third-party privacy policy applies.|Disabled|\n\nJoplin is developed as an open-source application and the source code is freely available online to inspect.\n\nFor any question about Joplin privacy, please leave a message on the [Joplin Forum](https://discourse.joplinapp.org/).\n", "tags": [], "resources": {}, "parent_id": "9bb5d498aba74cc6a047cfdc841e82a1" diff --git a/docs/api/index.html b/docs/api/index.html index 95ab315a0..795a490f2 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -332,10 +332,6 @@ https://github.com/laurent22/joplin/blob/master/readme/api.md -
-

joplin@1.0.155 start /Users/laurent/src/joplin-master/CliClient
-gulp build -L && node 'build/main.js' --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "apidoc"

-

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:

diff --git a/docs/changelog/index.html b/docs/changelog/index.html index 63ac407ba..4e2ce8f30 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -333,6 +333,98 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md

Joplin changelog🔗

+

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

+ +

v1.0.192 - 2020-03-06T23:27:52Z🔗

+

More fixes following latest pre-release.

+ +

v1.0.190 - 2020-03-06T01:22:22Z🔗

+

Fix more regressions from previous pre-release.

+ +

v1.0.189 - 2020-03-04T17:27:15Z🔗

+

Fixed issue from previous pre-release 1.0.187.

+

v1.0.187 - 2020-03-01T12:31:06Z🔗

diff --git a/docs/changelog_cli/index.html b/docs/changelog_cli/index.html index 42cdc3fa5..dde18a775 100644 --- a/docs/changelog_cli/index.html +++ b/docs/changelog_cli/index.html @@ -333,6 +333,16 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md

Joplin terminal app changelog🔗

+

cli-v1.0.161 - 2020-03-07T01:20:04Z🔗

+

cli-v1.0.154 - 2020-02-07T23:22:24Z🔗