Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Nov 16, 2018
1 parent e7ec2ce commit a3d64d0
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 100 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.114/Joplin-Setup-1.0.114.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.114/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.114/Joplin-1.0.114.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.114/Joplin-1.0.114-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.115/Joplin-Setup-1.0.115.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.115/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.115/Joplin-1.0.115.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.115/Joplin-1.0.115-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.

Expand Down
2 changes: 1 addition & 1 deletion Tools/build-all.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

"$ROOT_DIR/CliClient/run.sh" apidoc > "$ROOT_DIR/readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push
"$ROOT_DIR/../CliClient/run.sh" apidoc > "$ROOT_DIR/../readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push
10 changes: 0 additions & 10 deletions docs/api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -617,16 +617,6 @@ <h2 id="properties">Properties</h2>
<td>int</td>
<td></td>
</tr>
<tr>
<td>fetch_status</td>
<td>int</td>
<td></td>
</tr>
<tr>
<td>fetch_error</td>
<td>text</td>
<td></td>
</tr>
</tbody>
</table>
<h2 id="get-resources">GET /resources</h2>
Expand Down
24 changes: 17 additions & 7 deletions docs/changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,23 @@
</ul>
</div>
<h1 id="joplin-changelog">Joplin changelog</h1>
<h2 id="-v1-0-115-https-github-com-laurent22-joplin-releases-tag-v1-0-115-2018-11-16t16-52-02z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.115">v1.0.115</a> - 2018-11-16T16:52:02Z</h2>
<p>This is a rather large release which includes many of the pull requests that were submitted during Hacktoberfest, plus some extra improvements and bug fixes. Many thanks to all the contributors!</p>
<ul>
<li>New: Adds functionality to display tags under the open note. (<a href="https://github.com/laurent22/joplin/issues/893">#893</a>)</li>
<li>New: Joplin desktop Dark Mode (<a href="https://github.com/laurent22/joplin/issues/921">#921</a>)</li>
<li>New: Add support for custom css across all notes (<a href="https://github.com/laurent22/joplin/issues/925">#925</a>)</li>
<li>New: Show note title in pdf export (<a href="https://github.com/laurent22/joplin/issues/890">#890</a>) (<a href="https://github.com/laurent22/joplin/issues/937">#937</a>)</li>
<li>New: Display number of resources being fetched in side bar</li>
<li>New: Export notes to JSON (<a href="https://github.com/laurent22/joplin/issues/912">#912</a>, issues/912). (<a href="https://github.com/laurent22/joplin/issues/927">#927</a>)</li>
<li>New: Further (invisible) changes on how resources are downloaded to prepare for better resource handling.</li>
<li>Fix: Resolves <a href="https://github.com/laurent22/joplin/issues/918">#918</a>: Skip properties that are on sync target but not handled by local client</li>
<li>Fix: Fixes <a href="https://github.com/laurent22/joplin/issues/952">#952</a>: Upgraded Katex lib to fix bug</li>
<li>Fix: Fixes <a href="https://github.com/laurent22/joplin/issues/953">#953</a> (maybe): Improved the way internal links to notes are loaded to make it more reliable</li>
<li>Fix: Fix image fetching error for URLs that contain query parameters.</li>
<li>API: Allow setting the ID of newly created notes.</li>
<li>Renewed code signing certificate.</li>
</ul>
<h2 id="-v1-0-114-https-github-com-laurent22-joplin-releases-tag-v1-0-114-2018-10-24t20-14-10z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a> - 2018-10-24T20:14:10Z</h2>
<ul>
<li>Fixes <a href="https://github.com/laurent22/joplin/issues/832">#832</a>: Enex import: Don&#39;t add extra line breaks at the beginning of list item when it contains a block element</li>
Expand Down Expand Up @@ -505,13 +522,6 @@ <h2 id="-v1-0-70-https-github-com-laurent22-joplin-releases-tag-v1-0-70-2018-02-
<li>Fix: Fixed sync interval sorting order</li>
<li>Fix: <a href="https://github.com/laurent22/joplin/issues/256">#256</a>: Check that no other instance of Joplin is running before launching a new one</li>
</ul>
<h2 id="-v1-0-67-https-github-com-laurent22-joplin-releases-tag-v1-0-67-2018-02-19t22-51-08z"><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.67">v1.0.67</a> - 2018-02-19T22:51:08Z</h2>
<ul>
<li>Fixed: <a href="https://github.com/laurent22/joplin/issues/217">#217</a>: Display a message when the note has no content and only the note viewer is visible</li>
<li>Fixed: <a href="https://github.com/laurent22/joplin/issues/240">#240</a>: Tags should be handled in a case-insensitive way</li>
<li>Fixed: <a href="https://github.com/laurent22/joplin/issues/241">#241</a>: Ignore response for certain WebDAV calls to improve compatibility with some services.</li>
<li>Updated: French and Español translation</li>
</ul>

<script>
function stickyHeader() {
Expand Down
8 changes: 4 additions & 4 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -271,17 +271,17 @@ <h2 id="desktop-applications">Desktop applications</h2>
<tbody>
<tr>
<td>Windows (32 and 64-bit)</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.114/Joplin-Setup-1.0.114.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.114/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.115/Joplin-Setup-1.0.115.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.115/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.114/Joplin-1.0.114.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.115/Joplin-1.0.115.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.114/Joplin-1.0.114-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.115/Joplin-1.0.115-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>
Expand Down
92 changes: 46 additions & 46 deletions docs/stats/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -261,27 +261,27 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<tbody>
<tr>
<td>Total Windows downloads</td>
<td>72838</td>
<td>82451</td>
</tr>
<tr>
<td>Total macOs downloads</td>
<td>27452</td>
<td>30335</td>
</tr>
<tr>
<td>Total Linux downloads</td>
<td>25291</td>
<td>29161</td>
</tr>
<tr>
<td>Windows %</td>
<td>58%</td>
</tr>
<tr>
<td>macOS %</td>
<td>22%</td>
<td>21%</td>
</tr>
<tr>
<td>Linux %</td>
<td>20%</td>
<td>21%</td>
</tr>
</tbody>
</table>
Expand All @@ -298,20 +298,28 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
</thead>
<tbody>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a></td>
<td>2018-10-24T20:14:10Z</td>
<td></td>
<td>2</td>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.115">v1.0.115</a></td>
<td>2018-11-16T16:52:02Z</td>
<td>1</td>
<td>1</td>
<td></td>
<td>2 </td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a></td>
<td>2018-10-24T20:14:10Z</td>
<td>11253</td>
<td>3427</td>
<td>3808</td>
<td>18488</td>
</tr>
<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>11714</td>
<td>3080</td>
<td>3627</td>
<td>18421</td>
<td>11822</td>
<td>3105</td>
<td>3637</td>
<td>18564</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
Expand All @@ -325,9 +333,9 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<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>2063</td>
<td>672</td>
<td>673</td>
<td>307</td>
<td>3042</td>
<td>3043</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.108">v1.0.108</a></td>
Expand All @@ -340,34 +348,34 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<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>7098</td>
<td>7107</td>
<td>2108</td>
<td>1694</td>
<td>10900</td>
<td>10909</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.106">v1.0.106</a></td>
<td>2018-09-08T15:23:40Z</td>
<td>4501</td>
<td>4510</td>
<td>1435</td>
<td>288</td>
<td>6224</td>
<td>293</td>
<td>6238</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.105">v1.0.105</a></td>
<td>2018-09-05T11:29:36Z</td>
<td>4555</td>
<td>4568</td>
<td>1549</td>
<td>1427</td>
<td>7531</td>
<td>7544</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.104">v1.0.104</a></td>
<td>2018-06-28T20:25:36Z</td>
<td>14947</td>
<td>14957</td>
<td>4649</td>
<td>6893</td>
<td>26489</td>
<td>6937</td>
<td>26543</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.103">v1.0.103</a></td>
Expand Down Expand Up @@ -412,10 +420,10 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<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>2671</td>
<td>1194</td>
<td>1159</td>
<td>5024</td>
<td>2672</td>
<td>1195</td>
<td>1162</td>
<td>5029</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
Expand All @@ -437,9 +445,9 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.93">v1.0.93</a></td>
<td>2018-05-14T11:36:01Z</td>
<td>1766</td>
<td>853</td>
<td>857</td>
<td>738</td>
<td>3357</td>
<td>3361</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.91">v1.0.91</a></td>
Expand Down Expand Up @@ -468,10 +476,10 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
<td>2018-04-04T19:43:58Z</td>
<td>4454</td>
<td>2381</td>
<td>4468</td>
<td>2383</td>
<td>2627</td>
<td>9462</td>
<td>9478</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
Expand All @@ -485,9 +493,9 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.81">v1.0.81</a></td>
<td>2018-03-28T08:13:58Z</td>
<td>984</td>
<td>565</td>
<td>566</td>
<td>742</td>
<td>2291</td>
<td>2292</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.79">v1.0.79</a></td>
Expand All @@ -501,9 +509,9 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.78">v1.0.78</a></td>
<td>2018-03-17T15:27:18Z</td>
<td>1302</td>
<td>836</td>
<td>838</td>
<td>841</td>
<td>2979</td>
<td>2981</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.77">v1.0.77</a></td>
Expand All @@ -529,14 +537,6 @@ <h1 id="joplin-statistics">Joplin statistics</h1>
<td>1220</td>
<td>4086</td>
</tr>
<tr>
<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.67">v1.0.67</a></td>
<td>2018-02-19T22:51:08Z</td>
<td>1805</td>
<td>579</td>
<td></td>
<td>2384</td>
</tr>
</tbody>
</table>

Expand Down
2 changes: 0 additions & 2 deletions readme/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ file_extension | text |
encryption_cipher_text | text |
encryption_applied | int |
encryption_blob_encrypted | int |
fetch_status | int |
fetch_error | text |

## GET /resources

Expand Down
27 changes: 19 additions & 8 deletions readme/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Joplin changelog

## [v1.0.115](https://github.com/laurent22/joplin/releases/tag/v1.0.115) - 2018-11-16T16:52:02Z

This is a rather large release which includes many of the pull requests that were submitted during Hacktoberfest, plus some extra improvements and bug fixes. Many thanks to all the contributors!

- New: Adds functionality to display tags under the open note. ([#893](https://github.com/laurent22/joplin/issues/893))
- New: Joplin desktop Dark Mode ([#921](https://github.com/laurent22/joplin/issues/921))
- New: Add support for custom css across all notes ([#925](https://github.com/laurent22/joplin/issues/925))
- New: Show note title in pdf export ([#890](https://github.com/laurent22/joplin/issues/890)) ([#937](https://github.com/laurent22/joplin/issues/937))
- New: Display number of resources being fetched in side bar
- New: Export notes to JSON ([#912](https://github.com/laurent22/joplin/issues/912), issues/912). ([#927](https://github.com/laurent22/joplin/issues/927))
- New: Further (invisible) changes on how resources are downloaded to prepare for better resource handling.
- Fix: Resolves [#918](https://github.com/laurent22/joplin/issues/918): Skip properties that are on sync target but not handled by local client
- Fix: Fixes [#952](https://github.com/laurent22/joplin/issues/952): Upgraded Katex lib to fix bug
- Fix: Fixes [#953](https://github.com/laurent22/joplin/issues/953) (maybe): Improved the way internal links to notes are loaded to make it more reliable
- Fix: Fix image fetching error for URLs that contain query parameters.
- API: Allow setting the ID of newly created notes.
- Renewed code signing certificate.

## [v1.0.114](https://github.com/laurent22/joplin/releases/tag/v1.0.114) - 2018-10-24T20:14:10Z

- Fixes [#832](https://github.com/laurent22/joplin/issues/832): Enex import: Don't add extra line breaks at the beginning of list item when it contains a block element
Expand Down Expand Up @@ -266,11 +284,4 @@ Note: This fixes an invalid database upgrade in the previous version.
- New: Resolves [#243](https://github.com/laurent22/joplin/issues/243): Added black and white tray icon for macOS
- Fix: [#247](https://github.com/laurent22/joplin/issues/247): Unreadable error messages when checking for updates
- Fix: Fixed sync interval sorting order
- Fix: [#256](https://github.com/laurent22/joplin/issues/256): Check that no other instance of Joplin is running before launching a new one

## [v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) - 2018-02-19T22:51:08Z

- Fixed: [#217](https://github.com/laurent22/joplin/issues/217): Display a message when the note has no content and only the note viewer is visible
- Fixed: [#240](https://github.com/laurent22/joplin/issues/240): Tags should be handled in a case-insensitive way
- Fixed: [#241](https://github.com/laurent22/joplin/issues/241): Ignore response for certain WebDAV calls to improve compatibility with some services.
- Updated: French and Español translation
- Fix: [#256](https://github.com/laurent22/joplin/issues/256): Check that no other instance of Joplin is running before launching a new one
Loading

0 comments on commit a3d64d0

Please sign in to comment.