Linux script install: implement previous updates (#905)

Avoid an erroneous update and prevent installation icon only on gnome.

Clipper/joplin-webclipper/popup/src/randomClipperPort.js

@@ -1,20 +1,20 @@
 function randomClipperPort(state, env) {
-  const startPorts = {
-    prod: 41184,
-    dev: 27583,
-  };
+	const startPorts = {
+		prod: 41184,
+		dev: 27583,
+	};
 
-  const startPort = env === 'prod' ? startPorts.prod : startPorts.dev;
+	const startPort = env === 'prod' ? startPorts.prod : startPorts.dev;
 
-  if (!state) {
-    state = { offset: 0 };
-  } else {
-    state.offset++;
-  }
+	if (!state) {
+		state = { offset: 0 };
+	} else {
+		state.offset++;
+	}
 
-  state.port = startPort + state.offset;
+	state.port = startPort + state.offset;
 
-  return state;
+	return state;
 }
 
 module.exports = randomClipperPort;

ElectronClient/app/gui/NoteText.jsx

@@ -595,6 +595,8 @@ class NoteTextComponent extends React.Component {
 			} else {
 				require('electron').shell.openExternal(msg);
 			}
+		} else if (msg.indexOf('#') === 0) {
+			// This is an internal anchor, which is handled by the WebView so skip this case
 		} else {
 			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}

ElectronClient/app/gui/note-viewer/index.html

@@ -276,12 +276,24 @@
 		}
 	});
 
-	// Prevent URLs added via <a> tags from being opened within the application itself
 	document.addEventListener('click', function(event) {
 		const t = event.target;
+
+		// Prevent URLs added via <a> tags from being opened within the application itself
 		if (t && t.nodeName === 'A' && !t.hasAttribute('data-from-md')) {
 			event.preventDefault();
 			ipcProxySendToHost(t.getAttribute('href'));
+			return;
+		}
+
+		// IF this is an internal link, jump to the anchor directly
+		if (t && t.nodeName === 'A' && t.hasAttribute('data-from-md')) {
+			const href = t.getAttribute('href');
+			if (href.indexOf('#') === 0) {
+				event.preventDefault();
+				location.hash = href;
+				return;
+			}
 		}
 	});
 

Joplin_install_and_update.sh

@@ -1,52 +1,70 @@
 #!/bin/bash
 set -e
 # Title
-echo "       _             _  _         _           _        _ _           "
-echo "      | |           | |(_)       (_)         | |      | | |          "
-echo "      | | ___  _ __ | | _ _ __    _ _ __  ___| |_ __ _| | | ___ _ __ "
-echo "  _   | |/ _ \|  _ \| || |  _ \  | |  _ \ /  __|  __  | | |/ _ \ __| "
-echo " | |__| | (_) | |_) | || | | | | | | | | \__ \ || (_| | | |  __/ |   "
-echo "  \____/ \___/| .__/|_||_|_| |_| |_|_| |_|___/\__\__,_|_|_|\___|_|   "
-echo "              | |                                                    "
-echo "              |_|                                                    "
+echo "       _             _         _           _        _ _           "
+echo "      | |           (_)       (_)         | |      | | |          "
+echo "      | | ___  _ __  _ _ __    _ _ __  ___| |_ __ _| | | ___ _ __ "
+echo "  _   | |/ _ \\\| '_ \| | '_ \\  | | '_ \\\/ __| __/ _\` | | |/ _ \ '__|"
+echo " | |__| | (_) | |_) | | | | | | | | | \__ \ || (_| | | |  __/ |   "
+echo "  \____/ \___/| .__/|_|_| |_| |_|_| |_|___/\__\__,_|_|_|\___|_|   "
+echo "              | |                                                 "
+echo "              |_|                                                 "
+echo ""
+
+#-----------------------------------------------------
+# Download Joplin
+#-----------------------------------------------------
 
 # Get the latest version to download
 version=$(curl --silent "https://api.github.com/repos/laurent22/joplin/releases/latest" | grep -Po '"tag_name": "v\K.*?(?=")')
 
-# Delete previous version
-rm -f ~/.joplin/*.AppImage ~/.local/share/applications/*joplin.desktop
+# Check if it's in the latest version
+touch VERSION
+if [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
 
-# Creates the folder where the binary will be stored
-mkdir -p ~/.joplin/
+    # Delete previous version
+    rm -f ~/.joplin/*.AppImage ~/.local/share/applications/joplin.desktop ~/.joplin/VERSION
+    
+    # Creates the folder where the binary will be stored
+    mkdir -p ~/.joplin/
+    
+    # Download the latest version
+    wget -O ~/.joplin/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v$version/Joplin-$version-x86_64.AppImage 
+    
+    # Gives execution privileges
+    chmod +x ~/.joplin/Joplin.AppImage
+    
+    #-----------------------------------------------------
+    # Icon
+    #-----------------------------------------------------
+    
+    # Download icon
+    wget -O ~/.joplin/Icon512.png https://joplin.cozic.net/images/Icon512.png
+    
+    # Detect desktop environment  
+    if [ "$XDG_CURRENT_DESKTOP" = "" ]
+    then
+      desktop=$(echo "$XDG_DATA_DIRS" | sed 's/.*\(xfce\|kde\|gnome\).*/\1/')
+    else
+      desktop=$XDG_CURRENT_DESKTOP
+    fi
+    desktop=${desktop,,}  # convert to lower case
 
-# Download the latest version
-wget -O ~/.joplin/Joplin-$version-x86_64.AppImage https://github.com/laurent22/joplin/releases/download/v$version/Joplin-$version-x86_64.AppImage
- 
-# Gives execution privileges
-chmod +x ~/.joplin/Joplin-$version-x86_64.AppImage
-
-# Download icon
-wget -O ~/.joplin/Icon512.png https://joplin.cozic.net/images/Icon512.png
-
-# Detect desktop environment  
-if [ "$XDG_CURRENT_DESKTOP" = "" ]
-then
-  desktop=$(echo "$XDG_DATA_DIRS" | sed 's/.*\(xfce\|kde\|gnome\).*/\1/')
+    # Create icon for Gnome
+    if [[ $desktop =~ .*gnome.* ]] 
+    then
+       echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nExec=/home/$USER/.joplin/Joplin-$version-x86_64.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nType=Application\nCategories=Application;" >> ~/.local/share/applications/joplin.desktop
+    fi
+    
+    #-----------------------------------------------------
+    # Finish
+    #-----------------------------------------------------
+    
+    # Informs the user that it has been installed and cleans variables
+    echo 'Joplin installed in the version' $version
+    # Add version
+    echo $version > ~/.joplin/VERSION
 else
-  desktop=$XDG_CURRENT_DESKTOP
+    echo 'You are now in the latest version.'
 fi
-desktop=${desktop,,}  # convert to lower case
-
-# Create icon for Gnome
-if [[ $desktop =~ .*gnome.* ]] 
-then
-   echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nExec=/home/$USER/.joplin/Joplin-$version-x86_64.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nType=Application\nCategories=Application;" >> ~/.local/share/applications/joplin.desktop
-fi
-
-# Informs the user that it has been installed and cleans variables
-echo 'Joplin installed in the version' $version
-
-# start Joplin:
-~/.joplin/Joplin-$version-x86_64.AppImage
-
 unset version

README.md

@@ -50,7 +50,7 @@ wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_insta
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.148/joplin-v1.0.148.apk)
+Android          | <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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.174/joplin-v1.0.174.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplin.cozic.net/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097326
-		versionName "1.0.148"
+		versionCode 2097410
+		versionName "1.0.174"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}
@@ -154,6 +154,24 @@ dependencies {
 	compile project(':react-native-image-resizer')
 	compile project(':react-native-share-extension')
 	compile "com.facebook.react:react-native:+"
+
+	// To fix the error below, which happened after adding react-native-camera.
+	// Doesn't make any sense since rn-camera neither defines v26 nor 27 but
+	// v25.0.2 in build.gradle, but anyway now it works ¯\_(ツ)_/¯
+	// --------------------------------------------------------------------------------------
+	// Fatal error
+	// { Error: Command failed: ./gradlew assembleRelease -PbuildDir=build --console plain
+	//
+	// FAILURE: Build failed with an exception.
+	//
+	// * What went wrong:
+	// Execution failed for task ':app:preReleaseBuild'.
+	// > Android dependency 'com.android.support:support-v4' has different version for the compile (26.1.0) and runtime (27.1.1) classpath. You should manually set the same version via DependencyResolution
+	// --------------------------------------------------------------------------------------
+	// https://github.com/react-native-community/react-native-camera/issues/1532#issuecomment-386434771
+	compile ("com.android.support:support-v4:26.0.1") {
+        force = true //<-- force dependency resolution to 26.0.1 in my case
+    }
 }
 
 // Run this once to be able to run the application with BUCK

ReactNativeClient/android/build.gradle

@@ -6,14 +6,14 @@ buildscript {
         minSdkVersion = 16
         compileSdkVersion = 27
         targetSdkVersion = 26
-        supportLibVersion = "26.1.0"
+        supportLibVersion = "27.1.1"
     }
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

ReactNativeClient/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Oct 13 00:16:49 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

ReactNativeClient/lib/models/Note.js

@@ -73,8 +73,12 @@ class Note extends BaseItem {
 	}
 
 	static defaultTitle(note) {
-		if (note.body && note.body.length) {
-			const lines = note.body.trim().split("\n");
+		return this.defaultTitleFromBody(note.body);
+	}
+
+	static defaultTitleFromBody(body) {
+		if (body && body.length) {
+			const lines = body.trim().split("\n");
 			let output = lines[0].trim();
 			// Remove the first #, *, etc.
 			while (output.length) {

ReactNativeClient/lib/models/Setting.js

@@ -90,7 +90,7 @@ class Setting extends BaseModel {
 			// Might be fixed in Electron 18.x but no non-beta release yet. So for now
 			// by default we disable it on Linux.
 			'showTrayIcon': { value: platform !== 'linux', type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Show tray icon'), description: () => {
-				return platform === 'linux' ? _('Note: Does not work in all desktop environments.') : null;
+				return platform === 'linux' ? _('Note: Does not work in all desktop environments.') : _('This will allow Joplin to run in the background. It is recommended to enable this setting so that your notes are constantly being synchronised, thus reducing the number of conflicts.');
 			}},
 
 			'startMinimized': { value: false, type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Start application minimised in the tray icon') },

ReactNativeClient/lib/shim.js

@@ -18,6 +18,10 @@ shim.isLinux = () => {
 	return process && process.platform === 'linux';
 }
 
+shim.isFreeBSD = () => {
+	return process && process.platform === 'freebsd';
+}
+
 shim.isWindows = () => {
 	return process && process.platform === 'win32';
 }
@@ -31,6 +35,7 @@ shim.platformName = function() {
 	if (shim.isMac()) return 'darwin'; 
 	if (shim.isWindows()) return 'win32'; 
 	if (shim.isLinux()) return 'linux';
+ 	if (shim.isFreeBSD()) return 'freebsd';
 	throw new Error('Cannot determine platform');
 }
 
@@ -145,4 +150,4 @@ shim.Buffer = null;
 shim.openUrl = () => { throw new Error('Not implemented'); }
 shim.waitForFrame = () => { throw new Error('Not implemented'); }
 
-module.exports = { shim };
+module.exports = { shim };

ReactNativeClient/package-lock.json

@@ -929,7 +929,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "requires": {
         "ansi-wrap": "^0.1.0"
@@ -2723,14 +2723,14 @@
       "dependencies": {
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ="
         }
       }
     },
     "external-editor": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "requires": {
         "chardet": "^0.4.0",
@@ -3684,7 +3684,7 @@
     },
     "http-errors": {
       "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "requires": {
         "depd": "~1.1.2",
@@ -4788,7 +4788,7 @@
     },
     "jsonfile": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
       "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
       "requires": {
         "graceful-fs": "^4.1.6"
@@ -5173,7 +5173,7 @@
         },
         "load-json-file": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -5824,7 +5824,7 @@
     },
     "opn": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz",
       "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=",
       "requires": {
         "object-assign": "^4.0.1"
@@ -5994,7 +5994,7 @@
     },
     "pegjs": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
+      "resolved": "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
       "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0="
     },
     "performance-now": {
@@ -6108,7 +6108,7 @@
     },
     "pretty-format": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz",
       "integrity": "sha1-UwvlxCs8BbNkFKeipDN6qArNDo0="
     },
     "private": {
@@ -6397,7 +6397,7 @@
         },
         "load-json-file": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -7034,7 +7034,7 @@
     },
     "readable-stream": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
         "core-util-is": "~1.0.0",
@@ -8173,7 +8173,7 @@
       "dependencies": {
         "rimraf": {
           "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
           "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
         }
       }
@@ -8199,7 +8199,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
@@ -8758,7 +8758,7 @@
       "dependencies": {
         "uuid": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "resolved": "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
           "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
         }
       }
@@ -8810,7 +8810,7 @@
       "dependencies": {
         "sax": {
           "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.6.tgz",
+          "resolved": "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz",
           "integrity": "sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA="
         }
       }

ReactNativeClient/root.js

@@ -542,16 +542,32 @@ class AppComponent extends React.Component {
 			try {
 				const { type, value } = await ShareExtension.data();
 
-				if (type != "" && this.props.selectedFolderId) {
+				// reg.logger().info('Got share data:', type, value);
 
-					this.props.dispatch({
-						type: 'NAV_GO',
-						routeName: 'Note',
-						noteId: null,
-						sharedData: {type: type, value: value},
-						folderId: this.props.selectedFolderId,
-						itemType: 'note',
+				if (type != "" && this.props.selectedFolderId) {
+					const newNote = await Note.save({
+						title: Note.defaultTitleFromBody(value),
+						body: value,
+						parent_id: this.props.selectedFolderId
 					});
+
+					// This is a bit hacky, but the surest way to go to 
+					// the needed note. We go back one screen in case there's
+					// already a note open - if we don't do this, the dispatch
+					// below will do nothing (because routeName wouldn't change)
+					// Then we wait a bit for the state to be set correctly, and
+					// finally we go to the new note.
+					this.props.dispatch({
+						type: 'NAV_BACK',
+					});
+
+					setTimeout(() => {
+						this.props.dispatch({
+							type: 'NAV_GO',
+							routeName: 'Note',
+							noteId: newNote.id,
+						});
+					}, 5);
 				}
 
 			} catch(e) {

Tools/release-android.js

@@ -1,5 +1,5 @@
 const fs = require('fs-extra');
-const { execCommand, githubRelease, githubOauthToken, isWindows } = require('./tool-utils.js');
+const { execCommand, githubRelease, githubOauthToken, isWindows, fileExists } = require('./tool-utils.js');
 const path = require('path');
 const fetch = require('node-fetch');
 const uriTemplate = require('uri-template');
@@ -63,7 +63,7 @@ async function main() {
 
 	let restoreDir = null;
 	let apkBuildCmd = 'assembleRelease -PbuildDir=build --console plain';
-	if (isWindows()) {
+	if (await fileExists('/mnt/c/Windows/System32/cmd.exe')) {
 		apkBuildCmd = '/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat ' + apkBuildCmd + '"';
 	} else {
 		process.chdir(rnDir + '/android');

Tools/tool-utils.js

@@ -68,6 +68,8 @@ toolUtils.unlinkForce = async function(filePath) {
 }
 
 toolUtils.fileExists = async function(filePath) {
+	const fs = require('fs-extra');
+	
 	return new Promise((resolve, reject) => {
 		fs.stat(filePath, function(err, stat) {
 			if (err == null) {

docs/index.html

@@ -311,7 +311,7 @@
 <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://joplin.cozic.net/images/BadgeAndroid.png'/></a></td>
-<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.143/joplin-v1.0.143.apk">Download APK File</a></td>
+<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.151/joplin-v1.0.151.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -404,7 +404,7 @@
 :config sync.target 5
 </code></pre><p>If synchronisation does not work, please consult the logs in the app profile directory - it is often due to a misconfigured URL or password. The log should indicate what the exact issue is.</p>
 <h2 id="dropbox-synchronisation">Dropbox synchronisation</h2>
-<p>When syncing with Dropbox, Joplin creates a sub-directory in Dropbox, in /Apps/Joplin and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.</p>
+<p>When syncing with Dropbox, Joplin creates a sub-directory in Dropbox, in <code>/Apps/Joplin</code> and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.</p>
 <p>On the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;Dropbox&quot; as the synchronisation target in the config screen (it is selected by default). Then, to initiate the synchronisation process, click on the &quot;Synchronise&quot; button in the sidebar and follow the instructions.</p>
 <p>On the <strong>terminal application</strong>, to initiate the synchronisation process, type <code>:sync</code>. You will be asked to follow a link to authorise the application. It is possible to also synchronise outside of the user interface by typing <code>joplin sync</code> from the terminal. This can be used to setup a cron script to synchronise at regular interval. For example, this would do it every 30 minutes:</p>
 <pre><code>*/30 * * * * /path/to/joplin sync
@@ -417,6 +417,7 @@
 <li><a href="https://www.fastmail.com/">Fastmail</a></li>
 <li><a href="https://www.strato.fr/stockage-en-ligne/">HiDrive</a> from Strato. <a href="https://github.com/laurent22/joplin/issues/309">Setup help</a></li>
 <li><a href="https://nginx.org/en/docs/http/ngx_http_dav_module.html">Nginx WebDAV Module</a></li>
+<li><a href="https://nextcloud.com/">NextCloud</a></li>
 <li><a href="https://owncloud.org/">OwnCloud</a></li>
 <li><a href="https://www.seafile.com/">Seafile</a></li>
 <li><a href="https://www.transip.nl/stack/">Stack</a></li>
@@ -459,7 +460,7 @@
 <pre><code>[Link to my note](:/0b0d62d15e60409dac34f354b6e9e839)
 </code></pre><p>Since getting the ID of a note is not straightforward, each app provides a way to create such link. In the <strong>desktop app</strong>, right click on a note an select &quot;Copy Markdown link&quot;. In the <strong>mobile app</strong>, open a note and, in the top right menu, select &quot;Copy Markdown link&quot;. You can then paste this link anywhere in another note.</p>
 <h2 id="math-notation">Math notation</h2>
-<p>Math expressions can be added using the <a href="https://khan.github.io/KaTeX/">Katex notation</a>. To add an inline equation, wrap the expression in <code>$EXPRESSION$</code>, eg. <code>$\sqrt{3x-1}+(1+x)^2$</code>. To create an expression block, wrap it as follow:</p>
+<p>Math expressions can be added using the <a href="https://khan.github.io/KaTeX/">KaTeX notation</a>. To add an inline equation, wrap the expression in <code>$EXPRESSION$</code>, eg. <code>$\sqrt{3x-1}+(1+x)^2$</code>. To create an expression block, wrap it as follow:</p>
 <pre><code>$$
 EXPRESSION
 $$