Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Sep 9, 2019
1 parent 3c26159 commit 45a820b
Show file tree
Hide file tree
Showing 9 changed files with 139 additions and 88 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-Setup-1.0.165.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/JoplinPortable.exe'>Portable version</a><br><br>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 | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-1.0.165.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-1.0.165-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>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:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.166/Joplin-Setup-1.0.166.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.166/JoplinPortable.exe'>Portable version</a><br><br>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 | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.166/Joplin-1.0.166.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.166/Joplin-1.0.166-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>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:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`

## Mobile applications

Expand Down
12 changes: 12 additions & 0 deletions docs/changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,18 @@
</ul>
</div>
<h1><a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a>Joplin changelog</h1>
<h2><a name="v1-0-166-https-github-com-laurent22-joplin-releases-tag-v1-0-166-2019-09-09t17-35-54z" href="#v1-0-166-https-github-com-laurent22-joplin-releases-tag-v1-0-166-2019-09-09t17-35-54z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.166">v1.0.166</a> - 2019-09-09T17:35:54Z</h2>
<p>Note that on Windows the code signing certificate has been renewed, which sometimes trigger warnings when installing the application.</p>
<ul>
<li>New: Add support for anchor hashes in note links (<a href="https://github.com/laurent22/joplin/issues/1490">#1490</a>)</li>
<li>Improved: Only support checkboxes that start with a dash (<a href="https://github.com/laurent22/joplin/issues/1832">#1832</a>)</li>
<li>Improved: Apply current locale to date and time (<a href="https://github.com/laurent22/joplin/issues/1822">#1822</a>)</li>
<li>Improved: Update template prompt font and sort templates (<a href="https://github.com/laurent22/joplin/issues/1806">#1806</a>)</li>
<li>Fixed: Do not scroll text when search is open and user type in note (<a href="https://github.com/laurent22/joplin/issues/1833">#1833</a>)</li>
<li>Fixed: Fixed cropped content issue when printing or exporting to PDF (<a href="https://github.com/laurent22/joplin/issues/1815">#1815</a>)</li>
<li>Fixed: Fix typo on encryption options screen (<a href="https://github.com/laurent22/joplin/issues/1823">#1823</a>)</li>
<li>Fixed: Use correct date format for templates (<a href="https://github.com/laurent22/joplin/issues/1810">#1810</a>) (<a href="https://github.com/laurent22/joplin/issues/1803">#1803</a>)</li>
</ul>
<h2><a name="v1-0-165-https-github-com-laurent22-joplin-releases-tag-v1-0-165-2019-08-14t21-46-29z" href="#v1-0-165-https-github-com-laurent22-joplin-releases-tag-v1-0-165-2019-08-14t21-46-29z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.165">v1.0.165</a> - 2019-08-14T21:46:29Z</h2>
<ul>
<li>New: Added support for Fountain screenwriting language</li>
Expand Down
13 changes: 13 additions & 0 deletions docs/changelog_cli/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,19 @@
</ul>
</div>
<h1><a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a>Joplin terminal app changelog</h1>
<h2><a name="cli-v1-0-146-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-146-2019-09-08t19-12-41z" href="#cli-v1-0-146-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-146-2019-09-08t19-12-41z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.146">cli-v1.0.146</a> - 2019-09-08T19:12:41Z</h2>
<ul>
<li>Fixed: Fixed regression that was making installation fail</li>
</ul>
<h2><a name="cli-v1-0-145-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-145-2019-09-08t16-23-02z" href="#cli-v1-0-145-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-145-2019-09-08t16-23-02z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.145">cli-v1.0.145</a> - 2019-09-08T16:23:02Z</h2>
<ul>
<li>New: Added headless server command (Beta) (#1860)</li>
<li>Improved: Improved bold formatting support in Enex import (#1708)</li>
<li>Improved: Make translation files smaller by not including untranslated strings. Also add percentage translated to config screen. (#1459)</li>
<li>Fixed: Make sure setting side-effects are applied even when running in command line mode (#1779)</li>
<li>Fixed: Fix typo on encryption options screen (#1823)</li>
<li>Fixed: Fixes fatal error with cli 1.0.141 on start (#1791)</li>
</ul>
<h2><a name="cli-v1-0-137-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-137-2019-05-19t11-04-28z" href="#cli-v1-0-137-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-137-2019-05-19t11-04-28z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.137">cli-v1.0.137</a> - 2019-05-19T11:04:28Z</h2>
<ul>
<li>Fixed: Fixed method to autosize resource</li>
Expand Down
3 changes: 2 additions & 1 deletion docs/e2ee/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ <h1><a name="about-end-to-end-encryption-e2ee" href="#about-end-to-end-encryptio
<p>The system is designed to defeat any attempts at surveillance or tampering because no third party can decipher the data being communicated or stored.</p>
<p>There is a small overhead to using E2EE since data constantly has to be encrypted and decrypted so consider whether you really need the feature.</p>
<h1><a name="enabling-e2ee" href="#enabling-e2ee" class="heading-anchor">🔗</a>Enabling E2EE</h1>
<p>Due to the decentralised nature of Joplin, E2EE needs to be manually enabled on all the applications that you synchronise with. It is recommended to first enable it on the desktop or terminal application since they generally run on more powerful devices (unlike the mobile application), and so they can encrypt the initial data faster.</p>
<p>Due to the decentralised nature of Joplin, E2EE needs to be manually enabled on a single device first (this will create a Master Key for encryption secured by your password) and then it must be synced with all other remaining devices. It is recommended to start with the desktop or terminal application since they generally run on more powerful devices (unlike the mobile application), and so they can encrypt the initial data faster.</p>
<p>To enable it, please follow these steps:</p>
<ol>
<li>On your first device (eg. on the desktop application), go to the Encryption Config screen and click &quot;Enable encryption&quot;</li>
Expand All @@ -297,6 +297,7 @@ <h1><a name="enabling-e2ee" href="#enabling-e2ee" class="heading-anchor">🔗</a
<li>Once this first synchronisation operation is done, open the next device you are synchronising with. Click &quot;Synchronise&quot; and wait for the sync operation to complete. The device will receive the master key, and you will need to provide the password for it. At this point E2EE will be automatically enabled on this device. Once done, click Synchronise again and wait for it to complete.</li>
<li>Repeat step 5 for each device.</li>
</ol>
<p>Do not manually enable encryption on multiple devices in parallel, but rather wait for the other ones to sync with the first already encrypted device. Otherwise, you may end up with multiple encryption keys (which is supported by Joplin but most probably not what you want).</p>
<p>Once all the devices are in sync with E2EE enabled, the encryption/decryption should be mostly transparent. Occasionally you may see encrypted items but they will get decrypted in the background eventually.</p>
<h1><a name="disabling-e2ee" href="#disabling-e2ee" class="heading-anchor">🔗</a>Disabling E2EE</h1>
<p>Follow the same procedure as above but instead disable E2EE on each device one by one. Again it might be simpler to do it one device at a time and to wait every time for the synchronisation to complete.</p>
Expand Down
Loading

0 comments on commit 45a820b

Please sign in to comment.