Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Sep 29, 2019
1 parent 7e2e901 commit 75b7e7d
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 97 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,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.168/Joplin-Setup-1.0.168.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/JoplinPortable.exe'>Portable version</a><br><br>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.
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/Joplin-1.0.168.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/Joplin-1.0.168-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-Setup-1.0.169.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/JoplinPortable.exe'>Portable version</a><br><br>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.
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-1.0.169.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-1.0.169-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`

## Mobile applications

Expand Down
6 changes: 6 additions & 0 deletions docs/changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@
</ul>
</div>
<h1><a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a>Joplin changelog</h1>
<h2><a name="v1-0-169-https-github-com-laurent22-joplin-releases-tag-v1-0-169-2019-09-27t18-35-13z" href="#v1-0-169-https-github-com-laurent22-joplin-releases-tag-v1-0-169-2019-09-27t18-35-13z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.169">v1.0.169</a> - 2019-09-27T18:35:13Z</h2>
<ul>
<li>New: Add support for Deepin desktop environment in install script (<a href="https://github.com/laurent22/joplin/issues/1884">#1884</a>)</li>
<li>Improved: Improves deletion fail-safe so it is based on percentage of notes deleted. And display warning on sidebar.</li>
<li>Improved: Log last requests in case of a sync error</li>
</ul>
<h2><a name="v1-0-168-https-github-com-laurent22-joplin-releases-tag-v1-0-168-2019-09-25t21-21-38z" href="#v1-0-168-https-github-com-laurent22-joplin-releases-tag-v1-0-168-2019-09-25t21-21-38z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.168">v1.0.168</a> - 2019-09-25T21:21:38Z</h2>
<ul>
<li>New: Import Evernote notes as HTML (<a href="https://github.com/laurent22/joplin/issues/1887">#1887</a>)</li>
Expand Down
9 changes: 9 additions & 0 deletions docs/changelog_cli/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,15 @@
</ul>
</div>
<h1><a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a>Joplin terminal app changelog</h1>
<h2><a name="cli-v1-0-149-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-149-2019-09-27t21-18-57z" href="#cli-v1-0-149-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-149-2019-09-27t21-18-57z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.149">cli-v1.0.149</a> - 2019-09-27T21:18:57Z</h2>
<ul>
<li>New: Add support to Termux by returning a default when platform name cannot be determined (#1905)</li>
</ul>
<h2><a name="cli-v1-0-148-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-148-2019-09-27t18-42-36z" href="#cli-v1-0-148-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-148-2019-09-27t18-42-36z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.148">cli-v1.0.148</a> - 2019-09-27T18:42:36Z</h2>
<ul>
<li>Improved: Improves deletion fail-safe so it is based on percentage of notes deleted. And display warning on sidebar.</li>
<li>Improved: Log last requests in case of a sync error</li>
</ul>
<h2><a name="cli-v1-0-147-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-147-2019-09-25t21-26-24z" href="#cli-v1-0-147-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-147-2019-09-25t21-26-24z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.147">cli-v1.0.147</a> - 2019-09-25T21:26:24Z</h2>
<ul>
<li>New: Import Evernote notes as HTML (#1887)</li>
Expand Down
22 changes: 17 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,18 @@
</ul>
</div>
<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></p>
<hr>
<p><a href="https://hacktoberfest.digitalocean.com/">Hacktoberfest</a> is back this year again for our great pleasure ^^</p>
<p>here are the rules to participate:</p>
<blockquote>
<p>To qualify for the official limited edition Hacktoberfest shirt, you must register and make four pull requests (PRs) between October 1-31 (in any time zone). PRs can be made to any public repo on GitHub, not only the ones with issues labeled Hacktoberfest. This year, the first 50,000 participants who successfully complete the challenge will earn a T-shirt.</p>
</blockquote>
<p>To participate go to <a href="https://hacktoberfest.digitalocean.com/">https://hacktoberfest.digitalocean.com/</a>, log in (with you GitHub account) and you are ready to get in.</p>
<p>Next, go dive into the Joplin issues list labelled &quot;<a href="https://github.com/laurent22/joplin/labels/hacktoberfest">Hacktoberfest</a>&quot;</p>
<p>Start hacking, submit the PR from the 1st of October, not before.</p>
<p>We hope you will enjoy that event this year again like the previous one :jack_o_lantern: :tada:</p>
<p><em>PS: the 4 Pull Request don’t have to be done <strong>only</strong> on Joplin project, those can be done on any FOSS projects. Even PR for issue not tagged as 'hacktoberfest'</em></p>
<hr>
<p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="#markdown">Markdown format</a>.</p>
<p>Notes exported from Evernote via .enex files <a href="#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
<p>The notes can be <a href="#synchronisation">synchronised</a> with various cloud services including <a href="https://nextcloud.com/">Nextcloud</a>, Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
Expand All @@ -302,17 +314,17 @@ <h2><a name="desktop-applications" href="#desktop-applications" class="heading-a
<tbody>
<tr>
<td>Windows (32 and 64-bit)</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/Joplin-Setup-1.0.168.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> 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 &quot;JoplinProfile&quot; next to the executable file.</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-Setup-1.0.169.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> 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 &quot;JoplinProfile&quot; next to the executable file.</td>
</tr>
<tr>
<td>macOS</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/Joplin-1.0.168.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-1.0.169.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
<td>You can also use Homebrew: <code>brew cask install joplin</code></td>
</tr>
<tr>
<td>Linux</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.168/Joplin-1.0.168-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.169/Joplin-1.0.169-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
<td>An Arch Linux package <a href="#terminal-application">is also available</a>.<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> <code>wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash</code></td>
</tr>
</tbody>
Expand All @@ -330,7 +342,7 @@ <h2><a name="mobile-applications" href="#mobile-applications" class="heading-anc
<tr>
<td>Android</td>
<td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a></td>
<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.306/joplin-v1.0.306.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.306/joplin-v1.0.306-32bit.apk">32-bit</a></td>
<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.307/joplin-v1.0.307.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.307/joplin-v1.0.307-32bit.apk">32-bit</a></td>
</tr>
<tr>
<td>iOS</td>
Expand Down
Loading

0 comments on commit 75b7e7d

Please sign in to comment.