diff --git a/README.md b/README.md index 42e5969d3c..0228a7add5 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/docs/api/index.html b/docs/api/index.html index 96551a52bf..519e03a76b 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/api.md

  • Development

    diff --git a/docs/changelog/index.html b/docs/changelog/index.html index edcc31da75..4c18f00868 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md

  • Development

    @@ -351,6 +351,64 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md

    Joplin changelog🔗

    +

    v1.1.4 - 2020-09-21T11:20:09Z🔗

    + +

    v1.1.3 - 2020-09-17T10:30:37Z🔗

    + +

    v1.1.2 - 2020-09-15T12:58:38Z🔗

    + +

    v1.1.1 - 2020-09-11T23:32:47Z🔗

    + +

    v1.0.245 - 2020-09-09T12:56:10Z🔗

    +

    This release is to fix the sync lock issues on devices that have an incorrect clock. Specifically, it should fix this error: "Cannot acquire sync lock: either the lock could be written but not read back. Or it was expired before it was read again".

    +

    v1.0.242 - 2020-09-04T22:00:34Z🔗

    +

    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.

    diff --git a/docs/changelog_cli/index.html b/docs/changelog_cli/index.html index b888bdc9b7..9355125306 100644 --- a/docs/changelog_cli/index.html +++ b/docs/changelog_cli/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md

  • Development

    @@ -351,6 +351,17 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md

    Joplin terminal app changelog🔗

    +

    cli-v1.1.8 - 2020-09-21T12:02:29Z🔗

    + +

    cli-v1.0.168 - 2020-09-14T08:47:08Z🔗

    +

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

    diff --git a/docs/e2ee/index.html b/docs/e2ee/index.html index 6111d7fc11..3b3f06448e 100644 --- a/docs/e2ee/index.html +++ b/docs/e2ee/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/e2ee.md

  • Development

    diff --git a/docs/faq/index.html b/docs/faq/index.html index 25924d7696..b88a1a683a 100644 --- a/docs/faq/index.html +++ b/docs/faq/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/faq.md

  • Development

    diff --git a/docs/gsoc2020/ideas/index.html b/docs/gsoc2020/ideas/index.html index 557a6ba985..d9cb7092cd 100644 --- a/docs/gsoc2020/ideas/index.html +++ b/docs/gsoc2020/ideas/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/ideas.md

  • Development

    diff --git a/docs/gsoc2020/index.html b/docs/gsoc2020/index.html index 6427566958..f668ae1bed 100644 --- a/docs/gsoc2020/index.html +++ b/docs/gsoc2020/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/index.md

  • Development

    diff --git a/docs/gsod2020/ideas/index.html b/docs/gsod2020/ideas/index.html index 969c29df05..1232ac4c3f 100644 --- a/docs/gsod2020/ideas/index.html +++ b/docs/gsod2020/ideas/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/ideas.md

  • Development

    diff --git a/docs/gsod2020/index.html b/docs/gsod2020/index.html index 246c7f21d9..43d3534851 100644 --- a/docs/gsod2020/index.html +++ b/docs/gsod2020/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/index.md

  • Development

    diff --git a/docs/index.html b/docs/index.html index 00bcd1f280..01e90fbbd6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/README.md

  • Development

    @@ -371,17 +371,17 @@ https://github.com/laurent22/joplin/blob/master/README.md Windows (32 and 64-bit) -Get it on Windows -Or get the Portable version

    The 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. +Get it on Windows +Or get the Portable version

    The 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 +Get it on macOS You can also use Homebrew (unsupported): brew cask install joplin Linux -Get it on Linux +Get it on Linux An Arch Linux package (unsupported) is also available.

    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 @@ -399,7 +399,7 @@ https://github.com/laurent22/joplin/blob/master/README.md Android Get it on Google Play -or download the APK file: 64-bit 32-bit +or download the APK file: 64-bit 32-bit iOS @@ -469,6 +469,11 @@ https://github.com/laurent22/joplin/blob/master/README.md
    Frank Bloise
    Thomas Broussard + +
    Brandon Johnson + + +

    Features🔗

    @@ -824,35 +829,35 @@ Eg. :search -- "-tag:tag1".

    Arabic ar أحمد باشا إبراهيم (fi_ahmed_bacha@esi.dz) -82% +80% Basque eu juan.abasolo@ehu.eus -35% +34% Bosnian bs_BA Derviš T. (dervis.t@pm.me) -85% +83% Bulgarian bg_BG -68% +66% Catalan ca jmontane, 2019 -54% +53% @@ -866,28 +871,28 @@ Eg. :search -- "-tag:tag1".

    Czech cs_CZ Lukas Helebrandt (lukas@aiya.cz) -84% +82% Dansk da_DK Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk. -76% +74% Deutsch de_DE Eike (ei-ke@users.noreply.github.com) -99% +95% Eesti Keel et_EE -68% +66% @@ -908,182 +913,182 @@ Eg. :search -- "-tag:tag1".

    Español es_ES Fernando Pindado (fpindado@gmail.com) -91% +95% Esperanto eo Marton Paulo -39% +38% Français fr_FR Laurent Cozic -97% +94% Galician gl_ES Marcos Lans (marcoslansgarza@gmail.com) -44% +43% Indonesian id_ID Fathy AR (16875937+fathyar@users.noreply.github.com) -95% +93% Italiano it_IT StarFang208 -93% +91% Nederlands nl_NL MetBril (metbril@users.noreply.github.com) -99% +96% Nederlands nl_BE -35% +34% Norwegian nb_NO Mats Estensen (code@mxe.no) -91% +88% Persian fa -Mehrad Mahmoudian (mehrad@mahmoudian.me) -34% +Kourosh Firoozbakht (kourox@protonmail.com) +80% Polski pl_PL -87% +96% Português pt_PT Diogo Caveiro -91% +89% Português (Brasil) pt_BR Renato Nunes Bastos (rnbastos@gmail.com) -98% +96% Română ro - -35% +Cristi Duluta (cristi.duluta@gmail.com) +78% Slovenian sl_SI -44% +42% Svenska sv Jonatan Nyberg (jonatan@autistici.org) -73% +71% Thai th_TH -54% +52% Tiếng Việt vi -88% +85% Türkçe tr_TR Arda Kılıçdağı (arda@kilicdagi.com) -99% +96% Ελληνικά el_GR Harris Arvanitis (xaris@tuta.io) -93% +96% Русский ru_RU Sergey Segeda (thesermanarm@gmail.com) -90% +95% српски језик sr_RS -74% +72% 中文 (简体) zh_CN -yaozeye (yaozeye@outlook.com) -99% +WhiredPlanck (fungdaat31@outlook.com) +96% 中文 (繁體) zh_TW Yaoze Ye (yaozeye@yahoo.co.jp) -98% +95% 日本語 ja_JP genneko (genneko217@gmail.com) -99% +96% 한국어 ko -89% +86% diff --git a/docs/markdown/index.html b/docs/markdown/index.html index 85d00928f6..9d964ceb3e 100644 --- a/docs/markdown/index.html +++ b/docs/markdown/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/markdown.md

  • Development

    diff --git a/docs/mobile/index.html b/docs/mobile/index.html index 63d3a933f0..73f4179e4d 100644 --- a/docs/mobile/index.html +++ b/docs/mobile/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/mobile.md

  • Development

    diff --git a/docs/nextcloud_app/index.html b/docs/nextcloud_app/index.html index b560bba12a..dac0f8af99 100644 --- a/docs/nextcloud_app/index.html +++ b/docs/nextcloud_app/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/nextcloud_app.md

  • Development

    diff --git a/docs/prereleases/index.html b/docs/prereleases/index.html index 607a1378e4..1ca9648789 100644 --- a/docs/prereleases/index.html +++ b/docs/prereleases/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/prereleases.md

  • Development

    diff --git a/docs/spec/e2ee/index.html b/docs/spec/e2ee/index.html index fb84ee4c23..348f66509c 100644 --- a/docs/spec/e2ee/index.html +++ b/docs/spec/e2ee/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/spec/e2ee.md

  • Development

    diff --git a/docs/spec/history/index.html b/docs/spec/history/index.html index 70e40dcbe6..b5f606924b 100644 --- a/docs/spec/history/index.html +++ b/docs/spec/history/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/spec/history.md

  • Development

    diff --git a/docs/spec/sync_lock/index.html b/docs/spec/sync_lock/index.html index b2358016ab..f91891f83e 100644 --- a/docs/spec/sync_lock/index.html +++ b/docs/spec/sync_lock/index.html @@ -327,7 +327,7 @@ https://github.com/laurent22/joplin/blob/master/readme/spec/sync_lock.md

  • Development

    @@ -360,6 +360,8 @@ https://github.com/laurent22/joplin/blob/master/readme/spec/sync_lock.md

    When a client acquires a lock, it must refresh it every X seconds. A lock timeout after Y seconds (where X < Y). A lock with a timestamp greater than Y is considered expired and can be ignored by other clients. A client that tries to refresh a lock that has expired should fail.

    For example, if a client is currently syncing, it must stop doing so if it couldn't refresh the lock with Y seconds.

    For example, if a client is upgrading a target, it must stop doing so if it couldn't refresh the lock within Y seconds.

    +

    If the previous lock has expired, we shouldn't try to acquire a new one. This is because other clients, seeing no active lock, might have performed in the meantime operations that invalidates the current operation. For example, another client might have upgraded the sync target, so any active sync with an expired lock should be cancelled. Or if the current client was upgrading the sync target, another client might have synced since then, making any cached data invalid.

    +

    In some cases it should be safe to re-acquire a lock but adding support for this would make the algorithm more complex without much benefits.

    Acquiring a SYNC lock🔗