Mobile: Long press on images or other attachments to share them (#3367)

The link to the plugin tutorial was broken.

.eslintignore

@@ -199,6 +199,7 @@ ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/components/BackButtonDialogBox.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js

.github/PULL_REQUEST_TEMPLATE

@@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md
 
 -->

.gitignore

@@ -193,6 +193,7 @@ ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/components/BackButtonDialogBox.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js

CONTRIBUTING.md

@@ -38,7 +38,7 @@ If you want to start contributing to the project's code, please follow these gui
 - All the applications share the same backend (database, synchronisation, settings, models, business logic, etc.) so if you change something in the backend in one app, makes sure it still work in the other apps. Usually it does, but keep this in mind.
 - Pull requests that make many changes using an automated tool, like for spell fixing, styling, etc. will not be accepted. An exception would be if the changes have been discussed in the forum and someone has agreed to review **and test** the pull request.
 
-Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
+Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.
 
 ## Coding style
 

CliClient/locales-build/index.js

@@ -39,7 +39,7 @@ locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
 stats['ar'] = {"percentDone":80};
-stats['eu'] = {"percentDone":33};
+stats['eu'] = {"percentDone":34};
 stats['bs_BA'] = {"percentDone":83};
 stats['bg_BG'] = {"percentDone":66};
 stats['ca'] = {"percentDone":96};
@@ -52,21 +52,21 @@ stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
 stats['es_ES'] = {"percentDone":95};
 stats['eo'] = {"percentDone":38};
-stats['fr_FR'] = {"percentDone":98};
+stats['fr_FR'] = {"percentDone":99};
 stats['gl_ES'] = {"percentDone":43};
 stats['id_ID'] = {"percentDone":93};
-stats['it_IT'] = {"percentDone":91};
-stats['nl_NL'] = {"percentDone":95};
+stats['it_IT'] = {"percentDone":90};
 stats['nl_BE'] = {"percentDone":34};
+stats['nl_NL'] = {"percentDone":95};
 stats['nb_NO'] = {"percentDone":88};
 stats['fa'] = {"percentDone":83};
 stats['pl_PL'] = {"percentDone":98};
-stats['pt_PT'] = {"percentDone":89};
+stats['pt_PT'] = {"percentDone":88};
 stats['pt_BR'] = {"percentDone":96};
-stats['ro'] = {"percentDone":78};
+stats['ro'] = {"percentDone":77};
 stats['sl_SI'] = {"percentDone":42};
-stats['sv'] = {"percentDone":71};
-stats['th_TH'] = {"percentDone":53};
+stats['sv'] = {"percentDone":70};
+stats['th_TH'] = {"percentDone":52};
 stats['vi'] = {"percentDone":85};
 stats['tr_TR'] = {"percentDone":98};
 stats['el_GR'] = {"percentDone":96};

CliClient/package-lock.json

@@ -5901,9 +5901,9 @@
       }
     },
     "slug": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/slug/-/slug-3.3.4.tgz",
-      "integrity": "sha512-VpHbtRCEWmgaZsrZcTsVl/Dhw98lcrOYDO17DNmJCNpppI6s3qJvnNu2Q3D4L84/2bi6vkW40mjNQI9oGQsflg=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/slug/-/slug-3.5.0.tgz",
+      "integrity": "sha512-+pZLDhMtmAc+ZcojQSMlUKDZBYmvhZiZmK8Ffx/D3Q/MIMHPDBAMbWvWN8vJb9xl2MfbDdRWxFzrdOhBiyVpow=="
     },
     "snapdragon": {
       "version": "0.8.2",

CliClient/package.json

@@ -102,7 +102,7 @@
     "sax": "^1.2.4",
     "server-destroy": "^1.0.1",
     "sharp": "^0.23.2",
-    "slug": "^3.3.4",
+    "slug": "^3.5.0",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.1.1",
     "string-padding": "^1.0.2",

ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts

@@ -141,7 +141,7 @@ export default function useListIdent(CodeMirror: any) {
 		cm.setCursor({ line: anchor.line, ch: line.length });
 
 		cm.execCommand('insertListElement');
-		cm.setOption('disableInput', true);
+		CodeMirror.Vim.handleKey(cm, 'i', 'macro');
 	};
 
 	CodeMirror.commands.insertListElement = function(cm: any) {

ElectronClient/gui/SideBar/SideBar.tsx

@@ -361,6 +361,17 @@ class SideBarComponent extends React.Component<Props, State> {
 
 	renderFolderItem(folder:any, selected:boolean, hasChildren:boolean, depth:number) {
 		const anchorRef = this.anchorItemRef('folder', folder.id);
+		const isExpanded = this.props.collapsedFolderIds.indexOf(folder.id) < 0;
+		let noteCount = folder.note_count;
+
+		// Thunderbird count: Subtract children note_count from parent folder if it expanded.
+		if (isExpanded) {
+			for (let i = 0; i < this.props.folders.length; i++) {
+				if (this.props.folders[i].parent_id === folder.id) {
+					noteCount -= this.props.folders[i].note_count;
+				}
+			}
+		}
 
 		return <FolderItem
 			key={folder.id}
@@ -369,10 +380,10 @@ class SideBarComponent extends React.Component<Props, State> {
 			themeId={this.props.themeId}
 			depth={depth}
 			selected={selected}
-			isExpanded={this.props.collapsedFolderIds.indexOf(folder.id) < 0}
+			isExpanded={isExpanded}
 			hasChildren={hasChildren}
 			anchorRef={anchorRef}
-			noteCount={folder.note_count}
+			noteCount={noteCount}
 			onFolderDragStart_={this.onFolderDragStart_}
 			onFolderDragOver_={this.onFolderDragOver_}
 			onFolderDrop_={this.onFolderDrop_}