From 36c3521f400d0e337e49fb7dfc65a5f377147655 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sun, 30 Sep 2018 21:15:21 +0100
Subject: [PATCH] Update website

---
 README.md                 |  6 ++--
 docs/changelog/index.html | 33 ++++++-----------
 docs/index.html           |  8 ++---
 docs/stats/index.html     | 74 +++++++++++++++++++--------------------
 readme/changelog.md       | 42 +++++++++-------------
 readme/stats.md           | 22 ++++++------
 6 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/README.md b/README.md
index 53e9fbec6a..4ade1246b4 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.109/Joplin-Setup-1.0.109.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.109/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.109/Joplin-1.0.109.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.109/Joplin-1.0.109-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.111/Joplin-Setup-1.0.111.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.111/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.111/Joplin-1.0.111.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.111/Joplin-1.0.111-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 b5dd63e970..95e41c35ab 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -251,6 +251,15 @@
 </ul>
 </div>
 <h1 id="joplin-changelog">Joplin changelog</h1>
+<h2 id="-v1-0-111-https-github-com-laurent22-joplin-releases-tag-v1-0-111-2018-09-30t20-15-09z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a> - 2018-09-30T20:15:09Z</h2>
+<p>This is mainly a release to fix a bug related to the new IMG tag support.</p>
+<ul>
+<li>Electron: Resolves <a href="https://github.com/laurent22/joplin/issues/820">#820</a>: Allow dragging and dropping a note in another note to create a link</li>
+<li>Electron: Fixes resources being incorrectly auto-deleted when inside an IMG tag</li>
+<li>API: Allow downloading a resource data via <code>/resources/:id/file</code></li>
+</ul>
+<h2 id="-v1-0-110-https-github-com-laurent22-joplin-releases-tag-v1-0-110-2018-09-29t12-29-21z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a> - 2018-09-29T12:29:21Z</h2>
+<p>This is a release only to get the new API out. If you do not need the functionalities of this API or you don&#39;t know what it is, you can probably skip this version.</p>
 <h2 id="-v1-0-109-https-github-com-laurent22-joplin-releases-tag-v1-0-109-2018-09-27t18-01-41z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.109">v1.0.109</a> - 2018-09-27T18:01:41Z</h2>
 <ul>
 <li>New: Allow loading image resources in IMG html tags. For example, this is now possible: <code>&lt;img src=&quot;:/a92ac34387ff467a8c839d201dcd39aa&quot; width=&quot;50&quot;/&gt;</code></li>
@@ -265,6 +274,8 @@
 <li>Clipper: Fixed importing certain images with sources that contain brackets</li>
 <li>Improved: Mostly an invisible change at this point, but the REST API has been refactored to allow adding more calls and to support third-party applications.</li>
 </ul>
+<h2 id="-v1-0-108-https-github-com-laurent22-joplin-releases-tag-v1-0-108-2018-09-29t18-49-29z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.108">v1.0.108</a> - 2018-09-29T18:49:29Z</h2>
+<p>To test the latest security fix only. Won&#39;t be released officially.</p>
 <h2 id="-v1-0-107-https-github-com-laurent22-joplin-releases-tag-v1-0-107-2018-09-16t19-51-07z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.107">v1.0.107</a> - 2018-09-16T19:51:07Z</h2>
 <ul>
 <li>New: Resolves <a href="https://github.com/laurent22/joplin/issues/755">#755</a>: Added note properties dialog box to view and edit created time, updated time, source URL and geolocation</li>
@@ -491,28 +502,6 @@
 <li>Improved: More debug information when WebDAV sync target does not work.</li>
 <li>Improved: Compatibility with some WebDAV services (Seafile in particular)</li>
 </ul>
-<h2 id="-v1-0-65-https-github-com-laurent22-joplin-releases-tag-v1-0-65-2018-02-17t20-02-25z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.65">v1.0.65</a> - 2018-02-17T20:02:25Z</h2>
-<ul>
-<li>New: Added several keyboard shortcuts</li>
-<li>New: Convert new lines in tables to BR tags, and added support for HTML tags in Markdown viewers</li>
-<li>Fixed: Confirmation message boxes, and release notes text</li>
-<li>Fixed: Issue with items not being decrypted immediately when they are created due to a sync conflict.</li>
-<li>Updated: Translations</li>
-</ul>
-<h2 id="-v1-0-64-https-github-com-laurent22-joplin-releases-tag-v1-0-64-2018-02-16t00-58-20z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.64">v1.0.64</a> - 2018-02-16T00:58:20Z</h2>
-<p>Still more fixes and improvements to get v1 as stable as possible before adding new features.</p>
-<p>IMPORTANT: If you use Nextcloud it is recommended to sync all your notes before installing this release (see below).</p>
-<ul>
-<li>Fixed: Nextcloud sync target ID (which was incorrectly set to WebDAV sync ID). As a result items that have been created since this bug will be re-synced with Nextcloud. This sync will not duplicate or delete any item but is necessary to preserve data integrity. IF YOU HAVE NOTES IN CONFLICT AFTER SYNC: Close the app completely and restart it to make sure all the lists are visually up-to-date. The notes in conflict most likely can be ignored - they are just duplicate of the real ones. To be safe, check the content but most likely they can simply be deleted.</li>
-<li>Improved: Provide Content-Length header for WebDAV for better compatibility with more servers</li>
-<li>Fixed: Allow copy and paste from config and encryption screen on macOS</li>
-<li>Fixed: <a href="https://github.com/laurent22/joplin/issues/201">#201</a>, <a href="https://github.com/laurent22/joplin/issues/216">#216</a>: Make sure only one update check can run at a time, and improved modal dialog boxes</li>
-</ul>
-<h2 id="-v1-0-63-https-github-com-laurent22-joplin-releases-tag-v1-0-63-2018-02-14t19-40-36z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.63">v1.0.63</a> - 2018-02-14T19:40:36Z</h2>
-<ul>
-<li>Improved the way settings are changed. Should also fixed issue with sync context being accidentally broken.</li>
-<li>Improved WebDAV driver compatibility with some services (eg. Seafile)</li>
-</ul>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/index.html b/docs/index.html
index 780bfbd2f0..bb4fc39670 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -271,17 +271,17 @@
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.109/Joplin-Setup-1.0.109.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.109/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.111/Joplin-Setup-1.0.111.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.111/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.109/Joplin-1.0.109.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.111/Joplin-1.0.111.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.109/Joplin-1.0.109-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.111/Joplin-1.0.111-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 0eb6b82745..0357a99d09 100644
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -261,19 +261,19 @@
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>61069</td>
+<td>60940</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>24706</td>
+<td>24311</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>22832</td>
+<td>21700</td>
 </tr>
 <tr>
 <td>Windows %</td>
-<td>56%</td>
+<td>57%</td>
 </tr>
 <tr>
 <td>macOS %</td>
@@ -281,7 +281,7 @@
 </tr>
 <tr>
 <td>Linux %</td>
-<td>21%</td>
+<td>20%</td>
 </tr>
 </tbody>
 </table>
@@ -298,20 +298,44 @@
 </thead>
 <tbody>
 <tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a></td>
+<td>2018-09-30T20:15:09Z</td>
+<td>1</td>
+<td></td>
+<td></td>
+<td>1  </td>
+</tr>
+<tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
+<td>2018-09-29T12:29:21Z</td>
+<td>782</td>
+<td>243</td>
+<td>95</td>
+<td>1120</td>
+</tr>
+<tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.109">v1.0.109</a></td>
 <td>2018-09-27T18:01:41Z</td>
-<td>1559</td>
-<td>519</td>
-<td>219</td>
-<td>2297</td>
+<td>1939</td>
+<td>653</td>
+<td>304</td>
+<td>2896</td>
+</tr>
+<tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.108">v1.0.108</a></td>
+<td>2018-09-29T18:49:29Z</td>
+<td>4</td>
+<td></td>
+<td></td>
+<td>4  </td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.107">v1.0.107</a></td>
 <td>2018-09-16T19:51:07Z</td>
-<td>6634</td>
-<td>2100</td>
-<td>1687</td>
-<td>10421</td>
+<td>6888</td>
+<td>2103</td>
+<td>1688</td>
+<td>10679</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.106">v1.0.106</a></td>
@@ -513,30 +537,6 @@
 <td>72</td>
 <td>492</td>
 </tr>
-<tr>
-<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.65">v1.0.65</a></td>
-<td>2018-02-17T20:02:25Z</td>
-<td>185</td>
-<td>104</td>
-<td>114</td>
-<td>403</td>
-</tr>
-<tr>
-<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.64">v1.0.64</a></td>
-<td>2018-02-16T00:58:20Z</td>
-<td>1074</td>
-<td>528</td>
-<td>1116</td>
-<td>2718</td>
-</tr>
-<tr>
-<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.63">v1.0.63</a></td>
-<td>2018-02-14T19:40:36Z</td>
-<td>291</td>
-<td>143</td>
-<td>83</td>
-<td>517</td>
-</tr>
 </tbody>
 </table>
 
diff --git a/readme/changelog.md b/readme/changelog.md
index f485ddfb86..36ec4e1736 100644
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -1,5 +1,17 @@
 # Joplin changelog
 
+## [v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) - 2018-09-30T20:15:09Z
+
+This is mainly a release to fix a bug related to the new IMG tag support.
+
+- Electron: Resolves [#820](https://github.com/laurent22/joplin/issues/820): Allow dragging and dropping a note in another note to create a link
+- Electron: Fixes resources being incorrectly auto-deleted when inside an IMG tag
+- API: Allow downloading a resource data via `/resources/:id/file`
+
+## [v1.0.110](https://github.com/laurent22/joplin/releases/tag/v1.0.110) - 2018-09-29T12:29:21Z
+
+This is a release only to get the new API out. If you do not need the functionalities of this API or you don't know what it is, you can probably skip this version.
+
 ## [v1.0.109](https://github.com/laurent22/joplin/releases/tag/v1.0.109) - 2018-09-27T18:01:41Z
 
 - New: Allow loading image resources in IMG html tags. For example, this is now possible: `<img src=":/a92ac34387ff467a8c839d201dcd39aa" width="50"/>`
@@ -14,6 +26,10 @@
 - Clipper: Fixed importing certain images with sources that contain brackets
 - Improved: Mostly an invisible change at this point, but the REST API has been refactored to allow adding more calls and to support third-party applications.
 
+## [v1.0.108](https://github.com/laurent22/joplin/releases/tag/v1.0.108) - 2018-09-29T18:49:29Z
+
+To test the latest security fix only. Won't be released officially.
+
 ## [v1.0.107](https://github.com/laurent22/joplin/releases/tag/v1.0.107) - 2018-09-16T19:51:07Z
 
 - New: Resolves [#755](https://github.com/laurent22/joplin/issues/755): Added note properties dialog box to view and edit created time, updated time, source URL and geolocation
@@ -247,28 +263,4 @@ Note: This fixes an invalid database upgrade in the previous version.
 
 - Fixed: Local items were no longer being deleted via sync.
 - Improved: More debug information when WebDAV sync target does not work.
-- Improved: Compatibility with some WebDAV services (Seafile in particular)
-
-## [v1.0.65](https://github.com/laurent22/joplin/releases/tag/v1.0.65) - 2018-02-17T20:02:25Z
-
-- New: Added several keyboard shortcuts
-- New: Convert new lines in tables to BR tags, and added support for HTML tags in Markdown viewers
-- Fixed: Confirmation message boxes, and release notes text
-- Fixed: Issue with items not being decrypted immediately when they are created due to a sync conflict.
-- Updated: Translations
-
-## [v1.0.64](https://github.com/laurent22/joplin/releases/tag/v1.0.64) - 2018-02-16T00:58:20Z
-
-Still more fixes and improvements to get v1 as stable as possible before adding new features.
-
-IMPORTANT: If you use Nextcloud it is recommended to sync all your notes before installing this release (see below).
-
-- Fixed: Nextcloud sync target ID (which was incorrectly set to WebDAV sync ID). As a result items that have been created since this bug will be re-synced with Nextcloud. This sync will not duplicate or delete any item but is necessary to preserve data integrity. IF YOU HAVE NOTES IN CONFLICT AFTER SYNC: Close the app completely and restart it to make sure all the lists are visually up-to-date. The notes in conflict most likely can be ignored - they are just duplicate of the real ones. To be safe, check the content but most likely they can simply be deleted.
-- Improved: Provide Content-Length header for WebDAV for better compatibility with more servers
-- Fixed: Allow copy and paste from config and encryption screen on macOS
-- Fixed: [#201](https://github.com/laurent22/joplin/issues/201), [#216](https://github.com/laurent22/joplin/issues/216): Make sure only one update check can run at a time, and improved modal dialog boxes
-
-## [v1.0.63](https://github.com/laurent22/joplin/releases/tag/v1.0.63) - 2018-02-14T19:40:36Z
-
-- Improved the way settings are changed. Should also fixed issue with sync context being accidentally broken.
-- Improved WebDAV driver compatibility with some services (eg. Seafile)
\ No newline at end of file
+- Improved: Compatibility with some WebDAV services (Seafile in particular)
\ No newline at end of file
diff --git a/readme/stats.md b/readme/stats.md
index 795a1469c3..6ab7160c75 100644
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,17 +2,20 @@
 
 Name | Value
 --- | ---
-Total Windows downloads | 61069
-Total macOs downloads | 24706
-Total Linux downloads | 22832
-Windows % | 56%
+Total Windows downloads | 60940
+Total macOs downloads | 24311
+Total Linux downloads | 21700
+Windows % | 57%
 macOS % | 23%
-Linux % | 21%
+Linux % | 20%
 
 Version | Date | Windows | macOS | Linux | Total
 --- | --- | --- | --- | --- | ---
-[v1.0.109](https://github.com/laurent22/joplin/releases/tag/v1.0.109) | 2018-09-27T18:01:41Z | 1559 | 519 | 219 | 2297
-[v1.0.107](https://github.com/laurent22/joplin/releases/tag/v1.0.107) | 2018-09-16T19:51:07Z | 6634 | 2100 | 1687 | 10421
+[v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) | 2018-09-30T20:15:09Z | 1   |     |     | 1  
+[v1.0.110](https://github.com/laurent22/joplin/releases/tag/v1.0.110) | 2018-09-29T12:29:21Z | 782 | 243 | 95  | 1120
+[v1.0.109](https://github.com/laurent22/joplin/releases/tag/v1.0.109) | 2018-09-27T18:01:41Z | 1939 | 653 | 304 | 2896
+[v1.0.108](https://github.com/laurent22/joplin/releases/tag/v1.0.108) | 2018-09-29T18:49:29Z | 4   |     |     | 4  
+[v1.0.107](https://github.com/laurent22/joplin/releases/tag/v1.0.107) | 2018-09-16T19:51:07Z | 6888 | 2103 | 1688 | 10679
 [v1.0.106](https://github.com/laurent22/joplin/releases/tag/v1.0.106) | 2018-09-08T15:23:40Z | 4499 | 1435 | 285 | 6219
 [v1.0.105](https://github.com/laurent22/joplin/releases/tag/v1.0.105) | 2018-09-05T11:29:36Z | 4552 | 1544 | 1426 | 7522
 [v1.0.104](https://github.com/laurent22/joplin/releases/tag/v1.0.104) | 2018-06-28T20:25:36Z | 14943 | 4649 | 6882 | 26474
@@ -37,7 +40,4 @@ Version | Date | Windows | macOS | Linux | Total
 [v1.0.72](https://github.com/laurent22/joplin/releases/tag/v1.0.72) | 2018-03-14T09:44:35Z | 396 | 232 | 32  | 660
 [v1.0.70](https://github.com/laurent22/joplin/releases/tag/v1.0.70) | 2018-02-28T20:04:30Z | 1844 | 1022 | 1220 | 4086
 [v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1802 | 579 |     | 2381
-[v1.0.66](https://github.com/laurent22/joplin/releases/tag/v1.0.66) | 2018-02-18T23:09:09Z | 313 | 107 | 72  | 492
-[v1.0.65](https://github.com/laurent22/joplin/releases/tag/v1.0.65) | 2018-02-17T20:02:25Z | 185 | 104 | 114 | 403
-[v1.0.64](https://github.com/laurent22/joplin/releases/tag/v1.0.64) | 2018-02-16T00:58:20Z | 1074 | 528 | 1116 | 2718
-[v1.0.63](https://github.com/laurent22/joplin/releases/tag/v1.0.63) | 2018-02-14T19:40:36Z | 291 | 143 | 83  | 517
\ No newline at end of file
+[v1.0.66](https://github.com/laurent22/joplin/releases/tag/v1.0.66) | 2018-02-18T23:09:09Z | 313 | 107 | 72  | 492
\ No newline at end of file