Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Apr 10, 2020
1 parent db820d5 commit a4cc207
Show file tree
Hide file tree
Showing 10 changed files with 490 additions and 408 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,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.197/Joplin-Setup-1.0.197.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.197/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.197/Joplin-1.0.197.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.197/Joplin-1.0.197.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.199/Joplin-Setup-1.0.199.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.199/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.199/Joplin-1.0.199.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.199/Joplin-1.0.199.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
5 changes: 0 additions & 5 deletions docs/api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,6 @@
</li>
</ul>
</div>
<p>18:23:41 Profile directory: /Users/laurent/Temp/TestNotes2<br>
18:23:41 Trying to load 1 master keys...<br>
18:23:41 Loaded master keys: 0<br>
18:23:41 ResourceFetcher: Auto-add resources: Mode: always<br>
18:23:41 ResourceFetcher: Auto-added resources: 0</p>
<h1>Joplin API<a name="joplin-api" href="#joplin-api" class="heading-anchor">🔗</a></h1>
<p>In order to use it, you'll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port <strong>41184</strong>. If you want to find it programmatically, you may follow this kind of algorithm:</p>
<pre><code class="language-javascript">let port = null;
Expand Down
31 changes: 31 additions & 0 deletions docs/changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,37 @@
</ul>
</div>
<h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.199">v1.0.199</a> - 2020-04-10T18:41:58Z<a name="v1-0-199-https-github-com-laurent22-joplin-releases-tag-v1-0-199-2020-04-10t18-41-58z" href="#v1-0-199-https-github-com-laurent22-joplin-releases-tag-v1-0-199-2020-04-10t18-41-58z" class="heading-anchor">🔗</a></h2>
<ul>
<li>New: Added new Aritim-Dark theme (<a href="https://github.com/laurent22/joplin/issues/2997">#2997</a> by <a href="https://github.com/TobiasDev">@TobiasDev</a>)</li>
<li>New: WYSIWYG: Added support for code blocks edition and creation</li>
<li>New: WYSIWYG: Added support for tables</li>
<li>New: WYSIWYG: Apply theme to toolbar</li>
<li>New: WYSIWYG: Better handling of links on macOS and inside Katex block</li>
<li>New: WYSIWYG: Do not display target list in link dialog</li>
<li>New: WYSIWYG: Handle internal note links</li>
<li>New: WYSIWYG: Handle resource download mode</li>
<li>New: WYSIWYG: Improved documentation on what plugins are compatible with WYSIWYG editor</li>
<li>New: WYSIWYG: Preserve HTML code in Markdown when editing from wysiwyg editor</li>
<li>New: Add &quot;Retry All&quot; option to synchronisation page (<a href="https://github.com/laurent22/joplin/issues/2688">#2688</a>)</li>
<li>New: Add friendly default filenames to export options (<a href="https://github.com/laurent22/joplin/issues/2749">#2749</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
<li>New: Add message box to ask confirmation when resizing image</li>
<li>Improved: Clear provisional flag as soon as note is modified to avoid data loss (<a href="https://github.com/laurent22/joplin/issues/2681">#2681</a>)</li>
<li>Improved: Close <code>Goto Anything</code> modal on outside click (<a href="https://github.com/laurent22/joplin/issues/2940">#2940</a> by Siddhant Sehgal)</li>
<li>Improved: Moved all themes out into their own .js theme files (<a href="https://github.com/laurent22/joplin/issues/2951">#2951</a> by <a href="https://github.com/TobiasDev">@TobiasDev</a>)</li>
<li>Improved: Resource screen improvements (<a href="https://github.com/laurent22/joplin/issues/2850">#2850</a>) (<a href="https://github.com/laurent22/joplin/issues/2639">#2639</a>)</li>
<li>Improved: Right-click to move note to notebook (<a href="https://github.com/laurent22/joplin/issues/2566">#2566</a>) (<a href="https://github.com/laurent22/joplin/issues/2296">#2296</a> by Siddhant Sehgal)</li>
<li>Improved: Update it_IT.po (<a href="https://github.com/laurent22/joplin/issues/2978">#2978</a> by <a href="https://github.com/abonte">@abonte</a>)</li>
<li>Improved: Update ko.po (<a href="https://github.com/laurent22/joplin/issues/2986">#2986</a> by <a href="https://github.com/xmlangel">@xmlangel</a>)</li>
<li>Improved: Update nb_NO.po (<a href="https://github.com/laurent22/joplin/issues/2973">#2973</a> by Mats Estensen)</li>
<li>Improved: Update zh_CN.po (<a href="https://github.com/laurent22/joplin/issues/2971">#2971</a> by <a href="https://github.com/troilus">@troilus</a>)</li>
<li>Improved: Wait for note to be saved before closing the app</li>
<li>Fixed: Fixed iOS and macOS icons and created script to automate icon creation (<a href="https://github.com/laurent22/joplin/issues/2604">#2604</a>)</li>
<li>Fixed: Fixed regression when drag and dropping files</li>
<li>Fixed: Fixed styling issues with rendered Markdown</li>
<li>Fixed: Prevent decryption loop when a resource cannot be decrypted (<a href="https://github.com/laurent22/joplin/issues/2257">#2257</a>)</li>
<li>Fixed: When modifying a conflicted note, it would disappear from the view (<a href="https://github.com/laurent22/joplin/issues/2709">#2709</a>)</li>
</ul>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.197">v1.0.197</a> - 2020-03-30T17:21:22Z<a name="v1-0-197-https-github-com-laurent22-joplin-releases-tag-v1-0-197-2020-03-30t17-21-22z" href="#v1-0-197-https-github-com-laurent22-joplin-releases-tag-v1-0-197-2020-03-30t17-21-22z" class="heading-anchor">🔗</a></h2>
<ul>
<li>New: Added support for checkboxes and fixed various issues with WYSIWYG editor</li>
Expand Down
10 changes: 10 additions & 0 deletions docs/changelog_cli/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,16 @@
</ul>
</div>
<h1>Joplin terminal app changelog<a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a></h1>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.163">cli-v1.0.163</a> - 2020-04-10T18:31:50Z<a name="cli-v1-0-163-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-163-2020-04-10t18-31-50z" href="#cli-v1-0-163-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-163-2020-04-10t18-31-50z" class="heading-anchor">🔗</a></h2>
<ul>
<li>Improved: Update ko.po (#2986 by <a href="https://github.com/xmlangel">@xmlangel</a>)</li>
<li>Improved: Update it_IT.po (#2978 by <a href="https://github.com/abonte">@abonte</a>)</li>
<li>Improved: Update nb_NO.po (#2973 by Mats Estensen)</li>
<li>Improved: Update zh_CN.po (#2971 by <a href="https://github.com/troilus">@troilus</a>)</li>
<li>Fixed: Add support for retrying decryption after it has failed multiple times (#2981)</li>
<li>Fixed: When modifying a conflicted note, it would disappear from the view (#2709)</li>
<li>Fixed: Prevent decryption loop when a resource cannot be decrypted (#2257)</li>
</ul>
<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.162">cli-v1.0.162</a> - 2020-04-01T17:16:14Z<a name="cli-v1-0-162-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-162-2020-04-01t17-16-14z" href="#cli-v1-0-162-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-162-2020-04-01t17-16-14z" class="heading-anchor">🔗</a></h2>
<ul>
<li>New: Compatibility with new master key and sync target encryption</li>
Expand Down
11 changes: 11 additions & 0 deletions docs/faq/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,17 @@
</li>
</ul>
</div>
<h1>Installer gets stuck on Windows<a name="installer-gets-stuck-on-windows" href="#installer-gets-stuck-on-windows" class="heading-anchor">🔗</a></h1>
<p>The installer may get stuck if the app was not uninstalled correctly. To fix the issue you will need to clean up the left-over entry from the Registry. To do so please follow these steps:</p>
<ul>
<li>Press Win + R (Windows Key + R)</li>
<li>Type &quot;regedit.exe&quot;</li>
<li>Navigate to <code>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall</code></li>
<li>In there, you will see one or more folders. Open them one by one to find the one for Joplin. One of the entries in there should be &quot;DisplayName&quot; with value &quot;Joplin x.x.x&quot;.</li>
<li>Once found, delete that folder.</li>
</ul>
<p>Now try to install again and it should work.</p>
<p>More info there: <a href="https://github.com/electron-userland/electron-builder/issues/4057">https://github.com/electron-userland/electron-builder/issues/4057</a></p>
<h1>How can I edit my note in an external text editor?<a name="how-can-i-edit-my-note-in-an-external-text-editor" href="#how-can-i-edit-my-note-in-an-external-text-editor" class="heading-anchor">🔗</a></h1>
<p>The editor command (may include arguments) defines which editor will be used to open a note. If none is provided it will try to auto-detect the default editor. If this does nothing or you want to change it for Joplin, you need to configure it in the Preferences -&gt; Text editor command.</p>
<p>Some example configurations are: (comments after #)</p>
Expand Down
10 changes: 5 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,17 @@ <h2>Desktop applications<a name="desktop-applications" href="#desktop-applicatio
<tbody>
<tr>
<td>Windows (32 and 64-bit)</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.197/Joplin-Setup-1.0.197.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.197/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.199/Joplin-Setup-1.0.199.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.199/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.197/Joplin-1.0.197.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.199/Joplin-1.0.199.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.197/Joplin-1.0.197.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.199/Joplin-1.0.199.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 @@ -383,7 +383,7 @@ <h2>Mobile applications<a name="mobile-applications" href="#mobile-applications"
<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.325/joplin-v1.0.325.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.325/joplin-v1.0.325-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.327/joplin-v1.0.327.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.327/joplin-v1.0.327-32bit.apk">32-bit</a></td>
</tr>
<tr>
<td>iOS</td>
Expand Down
Loading

0 comments on commit a4cc207

Please sign in to comment.