diff --git a/README.md b/README.md
index be42506875..0566c59d49 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 b7b6f83a9d..da847cef67 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -250,6 +250,20 @@
Joplin changelog
+
+
+- New: Allow HTML in Markdown documents in a secure way.
+- New: Resolves #619: Context menu to cut, copy and paste. Also added menu to copy link in web view
+- New: Resolves #612: Allow duplicating a note
+- New: Web Clipper: Support 'author' property
+- Improved: Resolves #647: Allow specifying text editor path and arguments in setting
+- Improved: Optimised encryption and decryption of items so that it doesn't freeze the UI, especially on mobile
+- Improved: Set PDF default file name
+- Improved: Resolves #644: Added support for .markdown extension when importing files
+- Fixes #634: Press ESC to dismiss dialog in non-English languages
+- Fixes #639: Make sure text wraps when printing or exporting as PDF
+- Fixes #646: Mentioned that TLS settings must be saved before checking sync config
+
- New: Resolves #611: Allow opening and editing note in external editor
diff --git a/docs/index.html b/docs/index.html
index 6980df2bb7..a38542ad41 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -270,17 +270,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 6ff0c451f1..ce7901db34 100644
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -260,19 +260,19 @@
Total Windows downloads |
-28753 |
+30732 |
Total macOs downloads |
-14879 |
+15729 |
Total Linux downloads |
-13366 |
+14050 |
Windows % |
-50% |
+51% |
macOS % |
@@ -297,52 +297,60 @@
+v1.0.104 |
+2018-06-28T20:25:36Z |
+ |
+ |
+ |
+ |
+
+
v1.0.103 |
2018-06-21T19:38:13Z |
-14 |
-5 |
-2 |
-21 |
+1967 |
+841 |
+643 |
+3451 |
v1.0.101 |
2018-06-17T18:35:11Z |
-1252 |
-564 |
-365 |
-2181 |
+1266 |
+574 |
+393 |
+2233 |
v1.0.100 |
2018-06-14T17:41:43Z |
-829 |
+830 |
401 |
-217 |
-1447 |
+219 |
+1450 |
v1.0.99 |
2018-06-10T13:18:23Z |
-1211 |
+1212 |
573 |
-367 |
-2151 |
+369 |
+2154 |
v1.0.97 |
2018-06-09T19:23:34Z |
-271 |
+273 |
129 |
50 |
-450 |
+452 |
v1.0.96 |
2018-05-26T16:36:39Z |
-2653 |
-1191 |
+2654 |
+1192 |
1124 |
-4968 |
+4970 |
v1.0.95 |
@@ -363,18 +371,18 @@
v1.0.93 |
2018-05-14T11:36:01Z |
-1751 |
-824 |
-714 |
-3289 |
+1752 |
+826 |
+725 |
+3303 |
v1.0.91 |
2018-05-10T14:48:04Z |
-803 |
+804 |
528 |
284 |
-1615 |
+1616 |
v1.0.89 |
@@ -395,10 +403,10 @@
v1.0.83 |
2018-04-04T19:43:58Z |
-4396 |
+4398 |
2367 |
2625 |
-9388 |
+9390 |
v1.0.82 |
@@ -428,9 +436,9 @@
v1.0.78 |
2018-03-17T15:27:18Z |
1295 |
-832 |
+833 |
839 |
-2966 |
+2967 |
v1.0.77 |
@@ -459,10 +467,10 @@
v1.0.67 |
2018-02-19T22:51:08Z |
-1732 |
+1735 |
577 |
|
-2309 |
+2312 |
v1.0.66 |
diff --git a/readme/changelog.md b/readme/changelog.md
index a2173f616c..6a502e99ba 100644
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -1,5 +1,19 @@
# Joplin changelog
+## [v1.0.104](https://github.com/laurent22/joplin/releases/tag/v1.0.104) - 2018-06-28T20:25:36Z
+
+- New: Allow HTML in Markdown documents in a secure way.
+- New: Resolves [#619](https://github.com/laurent22/joplin/issues/619): Context menu to cut, copy and paste. Also added menu to copy link in web view
+- New: Resolves [#612](https://github.com/laurent22/joplin/issues/612): Allow duplicating a note
+- New: Web Clipper: Support 'author' property
+- Improved: Resolves [#647](https://github.com/laurent22/joplin/issues/647): Allow specifying text editor path and arguments in setting
+- Improved: Optimised encryption and decryption of items so that it doesn't freeze the UI, especially on mobile
+- Improved: Set PDF default file name
+- Improved: Resolves [#644](https://github.com/laurent22/joplin/issues/644): Added support for .markdown extension when importing files
+- Fixes [#634](https://github.com/laurent22/joplin/issues/634): Press ESC to dismiss dialog in non-English languages
+- Fixes [#639](https://github.com/laurent22/joplin/issues/639): Make sure text wraps when printing or exporting as PDF
+- Fixes [#646](https://github.com/laurent22/joplin/issues/646): Mentioned that TLS settings must be saved before checking sync config
+
## [v1.0.103](https://github.com/laurent22/joplin/releases/tag/v1.0.103) - 2018-06-21T19:38:13Z
- New: Resolves [#611](https://github.com/laurent22/joplin/issues/611): Allow opening and editing note in external editor
diff --git a/readme/stats.md b/readme/stats.md
index 35836a4ad2..e60e036158 100644
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,36 +2,37 @@
Name | Value
--- | ---
-Total Windows downloads | 28753
-Total macOs downloads | 14879
-Total Linux downloads | 13366
-Windows % | 50%
+Total Windows downloads | 30732
+Total macOs downloads | 15729
+Total Linux downloads | 14050
+Windows % | 51%
macOS % | 26%
Linux % | 23%
Version | Date | Windows | macOS | Linux | Total
--- | --- | --- | --- | --- | ---
-[v1.0.103](https://github.com/laurent22/joplin/releases/tag/v1.0.103) | 2018-06-21T19:38:13Z | 14 | 5 | 2 | 21
-[v1.0.101](https://github.com/laurent22/joplin/releases/tag/v1.0.101) | 2018-06-17T18:35:11Z | 1252 | 564 | 365 | 2181
-[v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) | 2018-06-14T17:41:43Z | 829 | 401 | 217 | 1447
-[v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1211 | 573 | 367 | 2151
-[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 271 | 129 | 50 | 450
-[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2653 | 1191 | 1124 | 4968
+[v1.0.104](https://github.com/laurent22/joplin/releases/tag/v1.0.104) | 2018-06-28T20:25:36Z | | | |
+[v1.0.103](https://github.com/laurent22/joplin/releases/tag/v1.0.103) | 2018-06-21T19:38:13Z | 1967 | 841 | 643 | 3451
+[v1.0.101](https://github.com/laurent22/joplin/releases/tag/v1.0.101) | 2018-06-17T18:35:11Z | 1266 | 574 | 393 | 2233
+[v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) | 2018-06-14T17:41:43Z | 830 | 401 | 219 | 1450
+[v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1212 | 573 | 369 | 2154
+[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 273 | 129 | 50 | 452
+[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2654 | 1192 | 1124 | 4970
[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 | 824 | 714 | 3289
-[v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 803 | 528 | 284 | 1615
+[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1752 | 826 | 725 | 3303
+[v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 804 | 528 | 284 | 1616
[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 | 4396 | 2367 | 2625 | 9388
+[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4398 | 2367 | 2625 | 9390
[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 | 740 | 2280
[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 | 1295 | 832 | 839 | 2966
+[v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1295 | 833 | 839 | 2967
[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
-[v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1732 | 577 | | 2309
+[v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1735 | 577 | | 2312
[v1.0.66](https://github.com/laurent22/joplin/releases/tag/v1.0.66) | 2018-02-18T23:09:09Z | 312 | 105 | 71 | 488
[v1.0.65](https://github.com/laurent22/joplin/releases/tag/v1.0.65) | 2018-02-17T20:02:25Z | 184 | 102 | 113 | 399
[v1.0.64](https://github.com/laurent22/joplin/releases/tag/v1.0.64) | 2018-02-16T00:58:20Z | 1066 | 526 | 1115 | 2707