diff --git a/README.md b/README.md
index c77575a084..a450e7ee87 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) | | or Get the Portable version
(to run from a USB key, etc.)
-macOS | |
-Linux | | An Arch Linux package
[is also available](#terminal-application).
+Windows (32 and 64-bit) | | or Get the Portable version
(to run from a USB key, etc.)
+macOS | |
+Linux | | An Arch Linux package
[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 4144ee3be8..dbcdf5f36b 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -247,6 +247,15 @@
Joplin changelog
+
+
+- New: Added toolbar buttons for formatting text.
+- New: Added Traditional Chinese and Catalan translations
+- Fixed: Handle Nginx DAV PROPFIND responses correctly
+- Fixes #597: Also import sub-notebooks when importing JEX data
+- Fixes #600: Improved resuming of long sync operations so that it doesn't needlessly re-download the items from the beginning
+- Fix: Try to display more info when there is a Dropbox API error
+
Note: This is the same as 1.0.97, but with a fix for the Linux version, which could not start anymore.
If you're using the web clipper, make sure to also update it!
diff --git a/docs/index.html b/docs/index.html
index 40bcf5df6f..a88d3e10bc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -267,17 +267,17 @@
Windows (32 and 64-bit) |
- |
-or Get the Portable version (to run from a USB key, etc.) |
+ |
+or Get the Portable version (to run from a USB key, etc.) |
macOS |
- |
+ |
|
Linux |
- |
+ |
An Arch Linux package is also available. |
diff --git a/docs/stats/index.html b/docs/stats/index.html
index 41508c97fb..1daacdf70a 100644
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -257,19 +257,19 @@
Total Windows downloads |
-28235 |
+28426 |
Total macOs downloads |
-14651 |
+14727 |
Total Linux downloads |
-13031 |
+13083 |
Windows % |
-50% |
+51% |
macOS % |
@@ -294,12 +294,20 @@
+v1.0.100 |
+2018-06-14T17:41:43Z |
+1 |
+ |
+ |
+1 |
+
+
v1.0.99 |
2018-06-10T13:18:23Z |
-1013 |
-486 |
-319 |
-1818 |
+1196 |
+559 |
+366 |
+2121 |
v1.0.97 |
@@ -312,10 +320,10 @@
v1.0.96 |
2018-05-26T16:36:39Z |
-2630 |
-1188 |
-1116 |
-4934 |
+2634 |
+1189 |
+1121 |
+4944 |
v1.0.95 |
@@ -337,9 +345,9 @@
v1.0.93 |
2018-05-14T11:36:01Z |
1751 |
-820 |
+822 |
711 |
-3282 |
+3284 |
v1.0.91 |
@@ -368,10 +376,10 @@
v1.0.83 |
2018-04-04T19:43:58Z |
-4386 |
+4388 |
2367 |
2625 |
-9378 |
+9380 |
v1.0.82 |
@@ -400,10 +408,10 @@
v1.0.78 |
2018-03-17T15:27:18Z |
-1294 |
+1295 |
832 |
839 |
-2965 |
+2966 |
v1.0.77 |
diff --git a/readme/changelog.md b/readme/changelog.md
index cbbe0b6326..e2f75c6b8a 100644
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -1,5 +1,14 @@
# Joplin changelog
+## [v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) - 2018-06-14T17:41:43Z
+
+- New: Added toolbar buttons for formatting text.
+- New: Added Traditional Chinese and Catalan translations
+- Fixed: Handle Nginx DAV PROPFIND responses correctly
+- Fixes [#597](https://github.com/laurent22/joplin/issues/597): Also import sub-notebooks when importing JEX data
+- Fixes [#600](https://github.com/laurent22/joplin/issues/600): Improved resuming of long sync operations so that it doesn't needlessly re-download the items from the beginning
+- Fix: Try to display more info when there is a Dropbox API error
+
## [v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) - 2018-06-10T13:18:23Z
Note: This is the same as 1.0.97, but with a fix for the Linux version, which could not start anymore.
diff --git a/readme/stats.md b/readme/stats.md
index 1b16f876d4..6b74150c23 100644
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,29 +2,30 @@
Name | Value
--- | ---
-Total Windows downloads | 28235
-Total macOs downloads | 14651
-Total Linux downloads | 13031
-Windows % | 50%
+Total Windows downloads | 28426
+Total macOs downloads | 14727
+Total Linux downloads | 13083
+Windows % | 51%
macOS % | 26%
Linux % | 23%
Version | Date | Windows | macOS | Linux | Total
--- | --- | --- | --- | --- | ---
-[v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1013 | 486 | 319 | 1818
+[v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) | 2018-06-14T17:41:43Z | 1 | | | 1
+[v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1196 | 559 | 366 | 2121
[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 268 | 127 | 50 | 445
-[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2630 | 1188 | 1116 | 4934
+[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2634 | 1189 | 1121 | 4944
[v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) | 2018-05-25T13:04:30Z | 366 | 184 | 79 | 629
[v1.0.94](https://github.com/laurent22/joplin/releases/tag/v1.0.94) | 2018-05-21T20:52:59Z | 1078 | 551 | 352 | 1981
-[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1751 | 820 | 711 | 3282
+[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1751 | 822 | 711 | 3284
[v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 803 | 528 | 284 | 1615
[v1.0.89](https://github.com/laurent22/joplin/releases/tag/v1.0.89) | 2018-05-09T13:05:05Z | 459 | 204 | 87 | 750
[v1.0.85](https://github.com/laurent22/joplin/releases/tag/v1.0.85) | 2018-05-01T21:08:24Z | 1626 | 927 | 605 | 3158
-[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4386 | 2367 | 2625 | 9378
+[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4388 | 2367 | 2625 | 9380
[v1.0.82](https://github.com/laurent22/joplin/releases/tag/v1.0.82) | 2018-03-31T19:16:31Z | 682 | 381 | 90 | 1153
[v1.0.81](https://github.com/laurent22/joplin/releases/tag/v1.0.81) | 2018-03-28T08:13:58Z | 977 | 563 | 738 | 2278
[v1.0.79](https://github.com/laurent22/joplin/releases/tag/v1.0.79) | 2018-03-23T18:00:11Z | 912 | 506 | 351 | 1769
-[v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1294 | 832 | 839 | 2965
+[v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1295 | 832 | 839 | 2966
[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 | 1020 | 1218 | 4074