From 8d25b8075d66e3168eb23213abc1719d39323f2c Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sat, 26 May 2018 17:37:17 +0100
Subject: [PATCH] Update website

---
 README.md                 |  6 +++---
 docs/changelog/index.html | 15 +++++++--------
 docs/index.html           |  8 ++++----
 docs/stats/index.html     | 40 +++++++++++++++++++--------------------
 readme/changelog.md       | 18 +++++++++---------
 readme/stats.md           | 20 ++++++++++----------
 6 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index b4890c89f..38fd14eb3 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)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-Setup-1.0.95.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-1.0.95.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-1.0.95-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-Setup-1.0.96.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-1.0.96.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-1.0.96-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
 
 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.
 
diff --git a/docs/changelog/index.html b/docs/changelog/index.html
index 2c136901d..eb03e0481 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -247,6 +247,13 @@
 </ul>
 </div>
 <h1 id="joplin-changelog">Joplin changelog</h1>
+<h2 id="-v1-0-96-https-github-com-laurent22-joplin-releases-tag-v1-0-96-2018-05-26t16-36-39z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.96">v1.0.96</a> - 2018-05-26T16:36:39Z</h2>
+<p>This release is mainly to fix various issues with the recently released Web Clipper.</p>
+<ul>
+<li>Clipper: Allow selecting folder to add the note to</li>
+<li>Clipper: Fixed issue when taking screenshot</li>
+<li>Clipper: Added Firefox extension</li>
+</ul>
 <h2 id="-v1-0-95-https-github-com-laurent22-joplin-releases-tag-v1-0-95-2018-05-25t13-04-30z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a> - 2018-05-25T13:04:30Z</h2>
 <ul>
 <li>New: A web clipper is now available - it allows saving web pages and screenshots from your browser to Joplin. To start using it, go to Options &gt; Web Clipper Options. Note that this feature is a beta release so there might still be some issues. Feedback is welcome.</li>
@@ -458,14 +465,6 @@
 <li>Fixed checkbox issue in config screen</li>
 <li>Fixed detection of encrypted item</li>
 </ul>
-<h2 id="-v0-10-48-https-github-com-laurent22-joplin-releases-tag-v0-10-48-2018-01-23t11-19-51z"><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.48">v0.10.48</a> - 2018-01-23T11:19:51Z</h2>
-<ul>
-<li>Improved and optimised file system sync target when many items are present.</li>
-<li>Fixes <a href="https://github.com/laurent22/joplin/issues/155">#155</a>: Caret alignment issue with Russian text</li>
-<li>Dutch translation (Thanks @tcassaert)</li>
-<li>Removed certain log statements so that sensitive info doesn&#39;t end up in logs</li>
-<li>Fix: Handle case where resource blob is missing during sync</li>
-</ul>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/index.html b/docs/index.html
index 807cd2fff..1161247ba 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -267,17 +267,17 @@
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-Setup-1.0.95.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a></td>
-<td>or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)</td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-Setup-1.0.96.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a></td>
+<td>or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)</td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-1.0.95.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-1.0.96.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a></td>
 <td></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.95/Joplin-1.0.95-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.96/Joplin-1.0.96-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a></td>
 <td>An Arch Linux package<br><a href="#terminal-application">is also available</a>.</td>
 </tr>
 </tbody>
diff --git a/docs/stats/index.html b/docs/stats/index.html
index e9efe8532..8580179fa 100644
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -257,27 +257,27 @@
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>27428</td>
+<td>25521</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>14900</td>
+<td>13805</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>11843</td>
+<td>11842</td>
 </tr>
 <tr>
 <td>Windows %</td>
-<td>51%</td>
+<td>50%</td>
 </tr>
 <tr>
 <td>macOS %</td>
-<td>28%</td>
+<td>27%</td>
 </tr>
 <tr>
 <td>Linux %</td>
-<td>22%</td>
+<td>23%</td>
 </tr>
 </tbody>
 </table>
@@ -294,12 +294,20 @@
 </thead>
 <tbody>
 <tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.96">v1.0.96</a></td>
+<td>2018-05-26T16:36:39Z</td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
 <td>2018-05-25T13:04:30Z</td>
-<td>280</td>
-<td>144</td>
-<td>64</td>
-<td>488</td>
+<td>328</td>
+<td>172</td>
+<td>78</td>
+<td>578</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.94">v1.0.94</a></td>
@@ -385,9 +393,9 @@
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.77">v1.0.77</a></td>
 <td>2018-03-16T15:12:35Z</td>
 <td>164</td>
-<td>84</td>
+<td>85</td>
 <td>23</td>
-<td>271</td>
+<td>272</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.72">v1.0.72</a></td>
@@ -493,14 +501,6 @@
 <td>317</td>
 <td>2603</td>
 </tr>
-<tr>
-<td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.48">v0.10.48</a></td>
-<td>2018-01-23T11:19:51Z</td>
-<td>1955</td>
-<td>1124</td>
-<td>15</td>
-<td>3094</td>
-</tr>
 </tbody>
 </table>
 
diff --git a/readme/changelog.md b/readme/changelog.md
index e110522cb..2a2e143af 100644
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -1,5 +1,13 @@
 # Joplin changelog
 
+## [v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) - 2018-05-26T16:36:39Z
+
+This release is mainly to fix various issues with the recently released Web Clipper.
+
+- Clipper: Allow selecting folder to add the note to
+- Clipper: Fixed issue when taking screenshot
+- Clipper: Added Firefox extension
+
 ## [v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) - 2018-05-25T13:04:30Z
 
 - New: A web clipper is now available - it allows saving web pages and screenshots from your browser to Joplin. To start using it, go to Options > Web Clipper Options. Note that this feature is a beta release so there might still be some issues. Feedback is welcome.
@@ -214,12 +222,4 @@ IMPORTANT: If you use Nextcloud it is recommended to sync all your notes before
 - Added Nextcloud support (Beta)
 - Upgraded Electron to 1.7.11 to fix security vulnerability
 - Fixed checkbox issue in config screen
-- Fixed detection of encrypted item
-
-## [v0.10.48](https://github.com/laurent22/joplin/releases/tag/v0.10.48) - 2018-01-23T11:19:51Z
-
-- Improved and optimised file system sync target when many items are present.
-- Fixes [#155](https://github.com/laurent22/joplin/issues/155): Caret alignment issue with Russian text
-- Dutch translation (Thanks @tcassaert)
-- Removed certain log statements so that sensitive info doesn't end up in logs
-- Fix: Handle case where resource blob is missing during sync
\ No newline at end of file
+- Fixed detection of encrypted item
\ No newline at end of file
diff --git a/readme/stats.md b/readme/stats.md
index b131dc8c5..5de1a4107 100644
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,16 +2,17 @@
 
 Name | Value
 --- | ---
-Total Windows downloads | 27428
-Total macOs downloads | 14900
-Total Linux downloads | 11843
-Windows % | 51%
-macOS % | 28%
-Linux % | 22%
+Total Windows downloads | 25521
+Total macOs downloads | 13805
+Total Linux downloads | 11842
+Windows % | 50%
+macOS % | 27%
+Linux % | 23%
 
 Version | Date | Windows | macOS | Linux | Total
 --- | --- | --- | --- | --- | ---
-[v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) | 2018-05-25T13:04:30Z | 280 | 144 | 64  | 488
+[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z |     |     |     |    
+[v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) | 2018-05-25T13:04:30Z | 328 | 172 | 78  | 578
 [v1.0.94](https://github.com/laurent22/joplin/releases/tag/v1.0.94) | 2018-05-21T20:52:59Z | 1069 | 550 | 348 | 1967
 [v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1749 | 816 | 700 | 3265
 [v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 803 | 528 | 283 | 1614
@@ -22,7 +23,7 @@ Version | Date | Windows | macOS | Linux | Total
 [v1.0.81](https://github.com/laurent22/joplin/releases/tag/v1.0.81) | 2018-03-28T08:13:58Z | 977 | 563 | 736 | 2276
 [v1.0.79](https://github.com/laurent22/joplin/releases/tag/v1.0.79) | 2018-03-23T18:00:11Z | 910 | 504 | 351 | 1765
 [v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1292 | 832 | 839 | 2963
-[v1.0.77](https://github.com/laurent22/joplin/releases/tag/v1.0.77) | 2018-03-16T15:12:35Z | 164 | 84  | 23  | 271
+[v1.0.77](https://github.com/laurent22/joplin/releases/tag/v1.0.77) | 2018-03-16T15:12:35Z | 164 | 85  | 23  | 272
 [v1.0.72](https://github.com/laurent22/joplin/releases/tag/v1.0.72) | 2018-03-14T09:44:35Z | 395 | 229 | 30  | 654
 [v1.0.70](https://github.com/laurent22/joplin/releases/tag/v1.0.70) | 2018-02-28T20:04:30Z | 1836 | 1018 | 1218 | 4072
 [v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1666 | 577 |     | 2243
@@ -35,5 +36,4 @@ Version | Date | Windows | macOS | Linux | Total
 [v0.10.60](https://github.com/laurent22/joplin/releases/tag/v0.10.60) | 2018-02-06T13:09:56Z | 710 | 491 | 538 | 1739
 [v0.10.54](https://github.com/laurent22/joplin/releases/tag/v0.10.54) | 2018-01-31T20:21:30Z | 1805 | 828 | 305 | 2938
 [v0.10.52](https://github.com/laurent22/joplin/releases/tag/v0.10.52) | 2018-01-31T19:25:18Z | 31  | 10  | 5   | 46 
-[v0.10.51](https://github.com/laurent22/joplin/releases/tag/v0.10.51) | 2018-01-28T18:47:02Z | 1309 | 977 | 317 | 2603
-[v0.10.48](https://github.com/laurent22/joplin/releases/tag/v0.10.48) | 2018-01-23T11:19:51Z | 1955 | 1124 | 15  | 3094
\ No newline at end of file
+[v0.10.51](https://github.com/laurent22/joplin/releases/tag/v0.10.51) | 2018-01-28T18:47:02Z | 1309 | 977 | 317 | 2603
\ No newline at end of file