From f47610e6fd1479d7fa81c885fa1b81f5832ffb10 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 9 Jun 2018 20:23:52 +0100 Subject: [PATCH] Update website --- Clipper/joplin-webclipper/manifest.json | 2 +- README.md | 6 +- ReactNativeClient/android/app/build.gradle | 4 +- docs/changelog/index.html | 8 ++ docs/index.html | 9 ++- docs/stats/index.html | 86 ++++++++++++---------- readme/changelog.md | 9 +++ readme/stats.md | 33 +++++---- 8 files changed, 92 insertions(+), 65 deletions(-) diff --git a/Clipper/joplin-webclipper/manifest.json b/Clipper/joplin-webclipper/manifest.json index 7f0cefce3..52fd63b38 100644 --- a/Clipper/joplin-webclipper/manifest.json +++ b/Clipper/joplin-webclipper/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Joplin Web Clipper", - "version": "1.0.3", + "version": "1.0.4", "description": "Capture and save web pages and screenshots from your browser to Joplin.", diff --git a/README.md b/README.md index 928338492..9622189bd 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) | Get it on Windows | or Get the Portable version
(to run from a USB key, etc.) -macOS | Get it on macOS | -Linux | Get it on Linux | An Arch Linux package
[is also available](#terminal-application). +Windows (32 and 64-bit) | Get it on Windows | or Get the Portable version
(to run from a USB key, etc.) +macOS | Get it on macOS | +Linux | Get it on 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/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index b7ea7f590..4031eb786 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -90,8 +90,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion 16 targetSdkVersion 26 - versionCode 2097303 - versionName "1.0.125" + versionCode 2097304 + versionName "1.0.126" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/docs/changelog/index.html b/docs/changelog/index.html index eb03e0481..db75ecc3d 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -247,6 +247,14 @@

Joplin changelog

+

v1.0.97 - 2018-06-09T19:23:34Z

+

If you're using the web clipper, make sure to also update it!

+

v1.0.96 - 2018-05-26T16:36:39Z

This release is mainly to fix various issues with the recently released Web Clipper.

Exporting

Joplin can export to the JEX format (Joplin Export file), which is a tar file that can contain multiple notes, notebooks, etc. This is a lossless format in that all the notes, but also metadata such as geo-location, updated time, tags, etc. are preserved. This format is convenient for backup purposes and can be re-imported into Joplin. A "raw" format is also available. This is the same as the JEX format except that the data is saved to a directory and each item represented by a single file.

diff --git a/docs/stats/index.html b/docs/stats/index.html index 8580179fa..3206279cb 100644 --- a/docs/stats/index.html +++ b/docs/stats/index.html @@ -257,15 +257,15 @@ Total Windows downloads -25521 +28231 Total macOs downloads -13805 +15009 Total Linux downloads -11842 +12968 Windows % @@ -294,52 +294,60 @@ +v1.0.97 +2018-06-09T19:23:34Z +1 + + +1 + + v1.0.96 2018-05-26T16:36:39Z - - - - +2611 +1182 +1105 +4898 v1.0.95 2018-05-25T13:04:30Z -328 -172 -78 -578 +366 +184 +79 +629 v1.0.94 2018-05-21T20:52:59Z -1069 -550 -348 -1967 +1077 +551 +352 +1980 v1.0.93 2018-05-14T11:36:01Z -1749 -816 -700 -3265 +1751 +820 +711 +3282 v1.0.91 2018-05-10T14:48:04Z 803 528 -283 -1614 +284 +1615 v1.0.89 2018-05-09T13:05:05Z -456 +459 204 87 -747 +750 v1.0.85 @@ -352,10 +360,10 @@ v1.0.83 2018-04-04T19:43:58Z -4373 +4386 2367 -2623 -9363 +2625 +9378 v1.0.82 @@ -370,24 +378,24 @@ 2018-03-28T08:13:58Z 977 563 -736 -2276 +738 +2278 v1.0.79 2018-03-23T18:00:11Z -910 -504 +912 +506 351 -1765 +1769 v1.0.78 2018-03-17T15:27:18Z -1292 +1294 832 839 -2963 +2965 v1.0.77 @@ -409,17 +417,17 @@ v1.0.70 2018-02-28T20:04:30Z 1836 -1018 +1020 1218 -4072 +4074 v1.0.67 2018-02-19T22:51:08Z -1666 +1696 577 -2243 +2273 v1.0.66 @@ -457,9 +465,9 @@ v1.0.62 2018-02-12T20:19:58Z 540 -271 +272 345 -1156 +1157 v0.10.61 diff --git a/readme/changelog.md b/readme/changelog.md index 2a2e143af..d3f8aaebc 100644 --- a/readme/changelog.md +++ b/readme/changelog.md @@ -1,5 +1,14 @@ # Joplin changelog +## [v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) - 2018-06-09T19:23:34Z + +If you're using the web clipper, make sure to also update it! + +- Updated: Auto-delete resources only after 10 days to handle some edge cases +- Clipper: Cleaner and more consistent clipper REST API, to facilitate third-party access +- Clipper: Fixes [#569](https://github.com/laurent22/joplin/issues/569): Make clipper service available on localhost only +- Clipper: Fixes [#573](https://github.com/laurent22/joplin/issues/573): Better handling of certain code blocks + ## [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. diff --git a/readme/stats.md b/readme/stats.md index 5de1a4107..350696de9 100644 --- a/readme/stats.md +++ b/readme/stats.md @@ -2,36 +2,37 @@ Name | Value --- | --- -Total Windows downloads | 25521 -Total macOs downloads | 13805 -Total Linux downloads | 11842 +Total Windows downloads | 28231 +Total macOs downloads | 15009 +Total Linux downloads | 12968 Windows % | 50% macOS % | 27% Linux % | 23% Version | Date | Windows | macOS | Linux | Total --- | --- | --- | --- | --- | --- -[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 -[v1.0.89](https://github.com/laurent22/joplin/releases/tag/v1.0.89) | 2018-05-09T13:05:05Z | 456 | 204 | 87 | 747 +[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 1 | | | 1 +[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2611 | 1182 | 1105 | 4898 +[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 | 1077 | 551 | 352 | 1980 +[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1751 | 820 | 711 | 3282 +[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 | 1625 | 927 | 605 | 3157 -[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4373 | 2367 | 2623 | 9363 +[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4386 | 2367 | 2625 | 9378 [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 | 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.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.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 +[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 | 1696 | 577 | | 2273 [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 [v1.0.63](https://github.com/laurent22/joplin/releases/tag/v1.0.63) | 2018-02-14T19:40:36Z | 284 | 141 | 82 | 507 -[v1.0.62](https://github.com/laurent22/joplin/releases/tag/v1.0.62) | 2018-02-12T20:19:58Z | 540 | 271 | 345 | 1156 +[v1.0.62](https://github.com/laurent22/joplin/releases/tag/v1.0.62) | 2018-02-12T20:19:58Z | 540 | 272 | 345 | 1157 [v0.10.61](https://github.com/laurent22/joplin/releases/tag/v0.10.61) | 2018-02-08T18:27:39Z | 955 | 601 | 940 | 2496 [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