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) | | 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 | | You can also use Homebrew: `brew cask install joplin`
-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) | | 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 | | You can also use Homebrew: `brew cask install joplin`
+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"
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.desktop
file & force refresh (#2479 by Brandon Wulf)More fixes following latest pre-release.
+Fix more regressions from previous pre-release.
+Fixed issue from previous pre-release 1.0.187.
+brew cask install joplin
wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash
Joplin can export to the JEX format (Joplin Export file), which is a tar file that can contain multiple notes, notebooks, etc. This is a lossless format in that all the notes, but also metadata such as geo-location, updated time, tags, etc. are preserved. This format is convenient for backup purposes and can be re-imported into Joplin. A "raw" format is also available. This is the same as the JEX format except that the data is saved to a directory and each item represented by a single file.
One of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as Nextcloud or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.
-Currently, synchronisation is possible with Nextcloud, Dropbox (by default), OneDrive or the local filesystem. To setup synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on "Synchronise" to start a synchronisation manually.
+Currently, synchronisation is possible with Nextcloud, Dropbox, OneDrive or the local filesystem. To enable synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on "Synchronise" to start a synchronisation manually.
Nextcloud is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it's open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.
In the desktop application or mobile application, go to the config screen and select Nextcloud as the synchronisation target. Then input the WebDAV URL (to get it, click on Settings in the bottom left corner of the page, in Nextcloud), this is normally https://example.com/nextcloud/remote.php/webdav/Joplin
(make sure to create the "Joplin" directory in Nextcloud), and set the username and password. If it does not work, please see this explanation for more details.
Joplin uses and renders a Github-flavoured Markdown with a few variations and additions. In particular it adds math formula support, interactive checkboxes and support for note links. Joplin also supports Markdown plugins which allow enabling and disabling various advanced Markdown features. Have a look at the Markdown Guide for more information.
Rendered markdown can be customized by placing a userstyle file in the profile directory ~/.config/joplin-desktop/userstyle.css
(This path might be different on your device - check at the top of the Config screen for the exact path). This file supports standard CSS syntax. Joplin must be restarted for the new css to be applied, please ensure that Joplin is not closing to the tray, but is actually exiting. Note that this file is used for both displaying the notes and printing the notes. Be aware how the CSS may look printed (for example, printing white text over a black background is usually not wanted).
Editor styles can be customized by placing a custom editor style file in the profile directory ~/.config/joplin-desktop/userchrome.css
.
The whole UI can be customized by placing a custom editor style file in the profile directory ~/.config/joplin-desktop/userchrome.css
.
Important: userstyle.css and userchrome.css are provided for your convenience, but they are advanced settings, and styles you define may break from one version to the next. If you want to use them, please know that it might require regular development work from you to keep them working. The Joplin team cannot make a commitment to keep the application HTML structure stable.
In the desktop app, templates can be used to create new notes or to insert into existing ones by creating a templates
folder in Joplin's config folder and placing Markdown template files into it. For example creating the file hours.md
in the templates
directory with the contents:
Date: {{date}}
@@ -628,6 +629,38 @@ Details:
Notes are sorted by "relevance". Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matters how close to each other the terms are. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as many details as possible to replicate the issue.
Goto Anything🔗
In the desktop application, press Ctrl+G or Cmd+G and type the title of a note to jump directly to it. You can also type #
followed by a tag or @
followed by a notebook title.
+Privacy🔗
+Joplin values your privacy and security by giving you complete control over your information and digital footprint.
+Joplin 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.
+Joplin 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:
+
+
+
+Feature
+Description
+Default
+
+
+
+
+Auto-update
+Joplin periodically connects to GitHub to check for new releases.
+Enabled
+
+
+Geo-location
+Joplin saves geo-location information in note properties when you create a note.
+Enabled
+
+
+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
+
+
+
+Joplin is developed as an open-source application and the source code is freely available online to inspect.
+For any question about Joplin privacy, please leave a message on the Joplin Forum.
Donations🔗
Donations to Joplin support the development of the project. Developing quality applications mostly takes time, but there are also some expenses, such as digital certificates to sign the applications, app store fees, hosting, etc. Most of all, your donation will make it possible to keep up the current development standard.
Please see the donation page for information on how to support the development of Joplin.
@@ -672,70 +705,70 @@ Details:
Arabic
ar
أحمد باشا إبراهيم (fi_ahmed_bacha@esi.dz)
-94%
+92%