Merge branch 'master' of github.com:laurent22/joplin

2024-11-30 08:26:59 +02:00 · 2019-11-11 09:43:42 +00:00 · 2019-11-11 09:43:42 +00:00 · 058b6265a6
commit 058b6265a6
parent d4234b8921 18762cd4d5
10 changed files with 41 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -60,15 +60,19 @@ script:
    npm install
    cd ..

-    # Run test units
-    cd CliClient
-    npm install
-    ./run_test.sh
-    testResult=$?
-    if [ $testResult -ne 0 ]; then
-      exit $testResult
+    # Run test units.
+    # Only do it for pull requests because Travis randomly fails to run them
+    # and that would break the desktop release.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      cd CliClient
+      npm install
+      ./run_test.sh
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+      cd ..
    fi
-    cd ..

    # Run linter for pull requests only - this is so that
    # bypassing eslint is allowed for urgent fixes.
--- a/ElectronClient/app/package-lock.json
+++ b/ElectronClient/app/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "Joplin",
-  "version": "1.0.172",
+  "version": "1.0.173",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "Joplin",
-  "version": "1.0.172",
+  "version": "1.0.173",
  "description": "Joplin for Desktop",
  "main": "main.js",
  "scripts": {
--- 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)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.171/Joplin-Setup-1.0.171.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.170/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.171/Joplin-1.0.171.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.171/Joplin-1.0.171-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.173/Joplin-Setup-1.0.173.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.173/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.173/Joplin-1.0.173.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.173/Joplin-1.0.173-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

--- a/ReactNativeClient/lib/models/Setting.js
+++ b/ReactNativeClient/lib/models/Setting.js
@ -247,7 +247,7 @@ class Setting extends BaseModel {
 					return output;
 				},
 			},
-			showNoteCounts: { value: false, type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Show note counts') },
+			showNoteCounts: { value: true, type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Show note counts') },
 			layoutButtonSequence: {
 				value: Setting.LAYOUT_ALL,
 				type: Setting.TYPE_INT,
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@ -307,7 +307,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md
 </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.171">v1.0.171</a> - 2019-11-11T07:52:48Z<a name="v1-0-171-https-github-com-laurent22-joplin-releases-tag-v1-0-171-2019-11-11t07-52-48z" href="#v1-0-171-https-github-com-laurent22-joplin-releases-tag-v1-0-171-2019-11-11t07-52-48z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.173">v1.0.173</a> - 2019-11-11T08:33:35Z<a name="v1-0-173-https-github-com-laurent22-joplin-releases-tag-v1-0-173-2019-11-11t08-33-35z" href="#v1-0-173-https-github-com-laurent22-joplin-releases-tag-v1-0-173-2019-11-11t08-33-35z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add new setting to show note counts for folders and tags (<a href="https://github.com/laurent22/joplin/issues/2006">#2006</a>)</li>
 <li>New: Add keyboard modes to editor (vim, emacs) (<a href="https://github.com/laurent22/joplin/issues/2056">#2056</a>) (<a href="https://github.com/laurent22/joplin/issues/1298">#1298</a>)</li>
--- a/docs/index.html
+++ b/docs/index.html
@ -326,17 +326,17 @@ https://github.com/laurent22/joplin/blob/master/
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.171/Joplin-Setup-1.0.171.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.170/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.173/Joplin-Setup-1.0.173.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.173/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.171/Joplin-1.0.171.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.173/Joplin-1.0.173.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.171/Joplin-1.0.171-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.173/Joplin-1.0.173-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>
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@ -317,15 +317,15 @@ https://github.com/laurent22/joplin/blob/master/readme/stats.md
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>415,649</td>
+<td>415,658</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>162,767</td>
+<td>162,765</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>127,631</td>
+<td>127,628</td>
 </tr>
 <tr>
 <td>Windows %</td>
@ -354,20 +354,20 @@ https://github.com/laurent22/joplin/blob/master/readme/stats.md
 </thead>
 <tbody>
 <tr>
-<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.171">v1.0.171</a></td>
-<td>2019-11-11T07:52:48Z</td>
-<td>8</td>
-<td>4</td>
-<td>3</td>
-<td>15</td>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.173">v1.0.173</a></td>
+<td>2019-11-11T08:33:35Z</td>
+<td>0</td>
+<td>1</td>
+<td>0</td>
+<td>1</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.170">v1.0.170</a></td>
 <td>2019-10-13T22:13:04Z</td>
-<td>26,267</td>
-<td>8,382</td>
+<td>26,284</td>
+<td>8,383</td>
 <td>7,596</td>
-<td>42,245</td>
+<td>42,263</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.169">v1.0.169</a></td>
--- a/readme/changelog.md
+++ b/readme/changelog.md
@ -1,6 +1,6 @@
 # Joplin changelog

-## [v1.0.171](https://github.com/laurent22/joplin/releases/tag/v1.0.171) - 2019-11-11T07:52:48Z
+## [v1.0.173](https://github.com/laurent22/joplin/releases/tag/v1.0.173) - 2019-11-11T08:33:35Z

 - New: Add new setting to show note counts for folders and tags ([#2006](https://github.com/laurent22/joplin/issues/2006))
 - New: Add keyboard modes to editor (vim, emacs) ([#2056](https://github.com/laurent22/joplin/issues/2056)) ([#1298](https://github.com/laurent22/joplin/issues/1298))
--- a/readme/stats.md
+++ b/readme/stats.md
@ -2,17 +2,17 @@

 Name | Value
 --- | ---
-Total Windows downloads | 415,649
-Total macOs downloads | 162,767
-Total Linux downloads | 127,631
+Total Windows downloads | 415,658
+Total macOs downloads | 162,765
+Total Linux downloads | 127,628
 Windows % | 59%
 macOS % | 23%
 Linux % | 18%

 Version | Date | Windows | macOS | Linux | Total
 --- | --- | --- | --- | --- | ---
-[v1.0.171](https://github.com/laurent22/joplin/releases/tag/v1.0.171) | 2019-11-11T07:52:48Z | 8   | 4   | 3   | 15 
-[v1.0.170](https://github.com/laurent22/joplin/releases/tag/v1.0.170) | 2019-10-13T22:13:04Z | 26,267 | 8,382 | 7,596 | 42,245
+[v1.0.173](https://github.com/laurent22/joplin/releases/tag/v1.0.173) | 2019-11-11T08:33:35Z | 0   | 1   | 0   | 1  
+[v1.0.170](https://github.com/laurent22/joplin/releases/tag/v1.0.170) | 2019-10-13T22:13:04Z | 26,284 | 8,383 | 7,596 | 42,263
 [v1.0.169](https://github.com/laurent22/joplin/releases/tag/v1.0.169) | 2019-09-27T18:35:13Z | 16,924 | 5,819 | 3,733 | 26,476
 [v1.0.168](https://github.com/laurent22/joplin/releases/tag/v1.0.168) | 2019-09-25T21:21:38Z | 5,268 | 2,227 | 697 | 8,192
 [v1.0.167](https://github.com/laurent22/joplin/releases/tag/v1.0.167) | 2019-09-10T08:48:37Z | 16,603 | 5,626 | 3,681 | 25,910