Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Apr 28, 2020
1 parent a5ec1be commit 0966989
Show file tree
Hide file tree
Showing 8 changed files with 684 additions and 618 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.199/Joplin-Setup-1.0.199.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.199/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.199/Joplin-1.0.199.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.199/Joplin-1.0.199.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.201/Joplin-Setup-1.0.201.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.201/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.201/Joplin-1.0.201.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.201/Joplin-1.0.201.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
21 changes: 21 additions & 0 deletions docs/changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,27 @@
</ul>
</div>
<h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.201">v1.0.201</a> - 2020-04-15T22:55:13Z<a name="v1-0-201-https-github-com-laurent22-joplin-releases-tag-v1-0-201-2020-04-15t22-55-13z" href="#v1-0-201-https-github-com-laurent22-joplin-releases-tag-v1-0-201-2020-04-15t22-55-13z" class="heading-anchor">🔗</a></h2>
<ul>
<li>Improved: Search in title and body by default when using Goto Anything</li>
<li>Improved: Disable prompt dialog OK button when input is empty (<a href="https://github.com/laurent22/joplin/issues/2905">#2905</a>) (<a href="https://github.com/laurent22/joplin/issues/2799">#2799</a> by Siddhant Sehgal)</li>
<li>Improved: Disable BASE html tag, which can break certain plugins such as Katex</li>
<li>Fixed: In some cases, notes with Katex code were not exported correctly as PDF (<a href="https://github.com/laurent22/joplin/issues/3058">#3058</a>)</li>
<li>Fixed: Trying to fix resource path issue in WYSIWYG editor (<a href="https://github.com/laurent22/joplin/issues/2968">#2968</a>)</li>
<li>Fixed: Fixed Katex rendering issue when greater than symbol appears in markup (<a href="https://github.com/laurent22/joplin/issues/3033">#3033</a>)</li>
</ul>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.200">v1.0.200</a> - 2020-04-12T12:17:46Z<a name="v1-0-200-https-github-com-laurent22-joplin-releases-tag-v1-0-200-2020-04-12t12-17-46z" href="#v1-0-200-https-github-com-laurent22-joplin-releases-tag-v1-0-200-2020-04-12t12-17-46z" class="heading-anchor">🔗</a></h2>
<p>This is to fix a few regressions in previous release.</p>
<ul>
<li>New: Add more log statements to attempt to fix <a href="https://github.com/laurent22/joplin/issues/2968">#2968</a></li>
<li>Improved: Update zh_TW.po (<a href="https://github.com/laurent22/joplin/issues/3020">#3020</a> by Ethan Chen)</li>
<li>Improved: Update sv.po (<a href="https://github.com/laurent22/joplin/issues/3013">#3013</a> by <a href="https://github.com/abolishallprivateproperty">@abolishallprivateproperty</a>)</li>
<li>Fixed: Fix Go To Anything closing when clicking inside the modal (<a href="https://github.com/laurent22/joplin/issues/3029">#3029</a>) (<a href="https://github.com/laurent22/joplin/issues/3028">#3028</a> by Anjula Karunarathne)</li>
<li>Fixed: Fix JEX export (<a href="https://github.com/laurent22/joplin/issues/3026">#3026</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
<li>Fixed: Fixes todo mouse hover behaviour (<a href="https://github.com/laurent22/joplin/issues/2831">#2831</a>) (<a href="https://github.com/laurent22/joplin/issues/2830">#2830</a> by Siddhant Sehgal)</li>
<li>Fixed: Fixes selection in text editor after applying formatting (<a href="https://github.com/laurent22/joplin/issues/2737">#2737</a>) (<a href="https://github.com/laurent22/joplin/issues/2736">#2736</a> by <a href="https://github.com/Rishgod">@Rishgod</a>)</li>
<li>Fixed: Title auto-update didn't work anymore (<a href="https://github.com/laurent22/joplin/issues/3019">#3019</a>)</li>
</ul>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.199">v1.0.199</a> - 2020-04-10T18:41:58Z<a name="v1-0-199-https-github-com-laurent22-joplin-releases-tag-v1-0-199-2020-04-10t18-41-58z" href="#v1-0-199-https-github-com-laurent22-joplin-releases-tag-v1-0-199-2020-04-10t18-41-58z" class="heading-anchor">🔗</a></h2>
<ul>
<li>New: Added new Aritim-Dark theme (<a href="https://github.com/laurent22/joplin/issues/2997">#2997</a> by <a href="https://github.com/TobiasDev">@TobiasDev</a>)</li>
Expand Down
16 changes: 9 additions & 7 deletions docs/donate/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -333,14 +333,16 @@
</ul>
</div>
<h1>Support Joplin development<a name="support-joplin-development" href="#support-joplin-development" class="heading-anchor">🔗</a></h1>
<p>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.</p>
<p>There are various ways to send a donation:</p>
<h2>Paypal<a name="paypal" href="#paypal" class="heading-anchor">🔗</a></h2>
<p>To donate via Paypal, please follow this link:</p>
<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/PayPalDonate.png" height="60px"/></a></p>
<p>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 standards.</p>
<h2>PayPal<a name="paypal" href="#paypal" class="heading-anchor">🔗</a></h2>
<p>To donate via PayPal, please follow this link:</p>
<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate on PayPal"></a></p>
<h2>GitHub Sponsor<a name="github-sponsor" href="#github-sponsor" class="heading-anchor">🔗</a></h2>
<p>Or follow this link to become a GitHub Sponsor:</p>
<p><a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/Patreon-GitHub.svg" alt="Sponsor on GitHub"></a></p>
<h2>Patreon<a name="patreon" href="#patreon" class="heading-anchor">🔗</a></h2>
<p>Or you may support the project on Patreon:</p>
<p><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon.png"/></a></p>
<p>Alternatively you may support the project on Patreon:</p>
<p><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></p>
<h2>Other way to support the development<a name="other-way-to-support-the-development" href="#other-way-to-support-the-development" class="heading-anchor">🔗</a></h2>
<p>Finally, there are other ways to support the development of Joplin:</p>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion docs/e2ee/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ <h1>Enabling E2EE<a name="enabling-e2ee" href="#enabling-e2ee" class="heading-an
<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>
<li>Input your password. This is the Master Key password which will be used to encrypt all your notes. Make sure you to not forget it since, for security reason, it cannot be recovered.</li>
<li>Input your password. This is the Master Key password which will be used to encrypt all your notes. Make sure you do not forget it since, for security reason, it cannot be recovered.</li>
<li>Now you need to synchronise all your notes so that they are sent encrypted to the sync target (eg. to OneDrive, Nextcloud, etc.). Wait for any synchronisation that might be in progress and click on &quot;Synchronise&quot;.</li>
<li>Wait for this synchronisation operation to complete. Since all the data needs to be re-sent (encrypted) to the sync target, it may take a long time, especially if you have many notes and resources. Note that even if synchronisation seems stuck, most likely it is still running - do not cancel it and simply let it run over night if needed.</li>
<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>
Expand Down
Loading

0 comments on commit 0966989

Please sign in to comment.