Android release v1.0.123

Updated Spanish translation

Assets/JoplinLetter.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="116.54575mm"
+   height="131.19589mm"
+   viewBox="0 0 116.54575 131.19589"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="JoplinLetter.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="152.11122"
+     inkscape:cy="-26.090631"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.7903623,-2.175533)">
+    <path
+       style="fill:#000000;stroke-width:0.26458332"
+       d="m 43.790458,133.13317 c -8.32317,-1.11843 -12.937,-2.40956 -18.46857,-5.16822 -10.21924,-5.09644 -18.1023498,-13.95338 -21.1745998,-23.79038 -1.22214,-3.91319 -1.3607,-4.872332 -1.35685,-9.392712 0.003,-3.72804 0.0907,-4.66941 0.59927,-6.44569 1.0664,-3.7246 2.49409,-6.1704 5.19529,-8.90014 3.2574198,-3.29184 6.6565798,-4.77332 11.3929598,-4.96548 4.53189,-0.18388 7.54661,0.59927 10.40386,2.70266 1.82035,1.34007 3.67693,3.96421 4.71565,6.66525 0.65839,1.71204 0.70959,2.1839 0.90042,8.29756 0.19973,6.39855 0.36372,7.6318 1.39223,10.469902 1.40468,3.87611 3.78939,6.56189 7.33039,8.25588 3.20047,1.53108 5.63801,2.00183 9.60817,1.8556 2.58182,-0.0951 3.60332,-0.25442 5.15337,-0.80371 4.61358,-1.63493 8.46322,-5.31381 10.31326,-9.85579 1.91154,-4.693002 1.90785,-4.609372 1.90213,-43.127082 -0.005,-33.78395 -0.0106,-34.14337 -0.54484,-35.32188 -1.30698,-2.882895 -2.68223,-3.398165 -9.66971,-3.622945 l -5.12472,-0.16486 V 10.998334 2.175533 l 31.41927,0.06723 31.419272,0.06723 0.0697,8.755726 0.0697,8.755724 -5.09675,0.1793 c -2.82759,0.0995 -5.60596,0.33101 -6.24051,0.52006 -1.72896,0.5151 -2.82899,1.538795 -3.52569,3.281045 l -0.61059,1.5269 -0.16762,34.7927 c -0.16988,35.26321 -0.19381,36.08914 -1.18496,40.914372 -1.81292,8.82581 -8.301582,17.89221 -16.959672,23.69719 -6.95182,4.66099 -14.48972,7.21214 -24.82645,8.40235 -2.7431,0.31585 -14.57797,0.31433 -16.93333,-0.002 z"
+       id="path21"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

BUILD.md

@@ -37,8 +37,6 @@ yarn dist
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
-For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
-
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
@@ -54,6 +52,10 @@ npm install
 yarn dist
 ```
 
+If node-gyp does not works (MSBUILD: error MSB3428: Could not load the Visual C++ component "VCBuild.exe"), you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
+
+If `yarn dist` fails, it may need administrative rights.
+
 # Building the Mobile application
 
 First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab.

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+# User support
+
+For general discussion about Joplin, user support, software development questions, and to discuss new features, please go to the [Joplin Forum](https://discourse.joplin.cozic.net/). It is possible to login with your GitHub account.
+
 # Reporting a bug
 
 Please check first that it [has not already been reported](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Also consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md) before reporting the issue so that you can provide as much details as possible to help fix it.
@@ -6,7 +10,7 @@ If possible, **please provide a screenshot**. A screenshot showing the problem i
 
 # Feature requests
 
-Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. Adding a "+1" comment does nothing.
+Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. "+1" comments are not tracked.
 
 # Adding new features
 

CliClient/app/app-gui.js

@@ -1,5 +1,6 @@
 const { Logger } = require('lib/logger.js');
 const Folder = require('lib/models/Folder.js');
+const BaseItem = require('lib/models/BaseItem.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
@@ -9,6 +10,8 @@ const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
 const { _ } = require('lib/locale.js');
+const Entities = require('html-entities').AllHtmlEntities;
+const htmlentities = (new Entities()).encode;
 
 const chalk = require('chalk');
 const tk = require('terminal-kit');
@@ -638,12 +641,27 @@ class AppGui {
 				return true;
 			}
 
-			if (link.type === 'resource') {
-				const resourceId = link.id;
-				let resource = await Resource.load(resourceId);
-				if (!resource) throw new Error('No resource with ID ' + resourceId); // Should be nearly impossible
-				if (resource.mime) response.setHeader('Content-Type', resource.mime);
-				response.write(await Resource.content(resource));
+			if (link.type === 'item') {
+				const itemId = link.id;
+				let item = await BaseItem.loadItemById(itemId);
+				if (!item) throw new Error('No item with ID ' + itemId); // Should be nearly impossible
+
+				if (item.type_ === BaseModel.TYPE_RESOURCE) {
+					if (item.mime) response.setHeader('Content-Type', item.mime);
+					response.write(await Resource.content(item));
+				} else if (item.type_ === BaseModel.TYPE_NOTE) {
+					const html = [`
+						<!DOCTYPE html>
+						<html class="client-nojs" lang="en" dir="ltr">
+						<head><meta charset="UTF-8"/></head><body>
+					`];
+					html.push('<pre>' + htmlentities(item.title) + '\n\n' + htmlentities(item.body) + '</pre>');
+					html.push('</body></html>');
+					response.write(html.join(''));
+				} else {
+					throw new Error('Unsupported item type: ' + item.type_);
+				}
+
 				return true;
 			}
 
@@ -659,7 +677,7 @@ class AppGui {
 
 				if (resourceIdRegex.test(url)) {
 					noteLinks[index] = {
-						type: 'resource',
+						type: 'item',
 						id: url.substr(2),
 					};					
 				} else if (hasProtocol(url, ['http', 'https', 'file', 'ftp'])) {

CliClient/app/autocompletion.js

@@ -36,7 +36,7 @@ async function handleAutocompletionPromise(line) {
 	if (next[0] === '-') {
 		for (let i = 0; i<metadata.options.length; i++) {
 			const options = metadata.options[i][0].split(' ');
-		//if there are multiple options then they will be seperated by comma and
+		//if there are multiple options then they will be separated by comma and
 			//space. The comma should be removed
 			if (options[0][options[0].length - 1] === ',') {
 				options[0] = options[0].slice(0, -1);

CliClient/app/command-help.js

@@ -72,11 +72,11 @@ class Command extends BaseCommand {
 			this.stdout('');
 			this.stdout(commandNames.join(', '));
 			this.stdout('');
-			this.stdout(_('In any command, a note or notebook can be refered to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
+			this.stdout(_('In any command, a note or notebook can be referred to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
 			this.stdout('');
 			this.stdout(_('To move from one pane to another, press Tab or Shift+Tab.'));
 			this.stdout(_('Use the arrows and page up/down to scroll the lists and text areas (including this console).'));
-			this.stdout(_('To maximise/minimise the console, press "TC".'));
+			this.stdout(_('To maximise/minimise the console, press "tc".'));
 			this.stdout(_('To enter command line mode, press ":"'));
 			this.stdout(_('To exit command line mode, press ESCAPE'));
 			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));

CliClient/app/command-rmbook.js

@@ -29,7 +29,7 @@ class Command extends BaseCommand {
 
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
 		if (!folder) throw new Error(_('Cannot find "%s".', pattern));
-		const ok = force ? true : await this.prompt(_('Delete notebook? All notes within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
+		const ok = force ? true : await this.prompt(_('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
 		if (!ok) return;
 
 		await Folder.delete(folder.id);

CliClient/app/gui/FolderListWidget.js

@@ -18,19 +18,20 @@ class FolderListWidget extends ListWidget {
 		this.notesParentType_ = 'Folder';
 		this.updateIndexFromSelectedFolderId_ = false;
 		this.updateItems_ = false;
+		this.trimItemTitle = false;
 
 		this.itemRenderer = (item) => {
 			let output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(Folder.displayTitle(item));
+				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
 			} else if (item.type_ === Tag.modelType()) {
 				output.push('[' + Folder.displayTitle(item) + ']');
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);
-			}			
+			}
 
 			// if (item && item.id) output.push(item.id.substr(0, 5));
 			
@@ -38,6 +39,17 @@ class FolderListWidget extends ListWidget {
 		};
 	}
 
+	folderDepth(folders, folderId) {
+		let output = 0;
+		while (true) {
+			const folder = BaseModel.byId(folders, folderId);
+			if (!folder.parent_id) return output;
+			output++;
+			folderId = folder.parent_id;
+		}
+		throw new Error('unreachable');
+	}
+
 	get selectedFolderId() {
 		return this.selectedFolderId_;
 	}

CliClient/locales/cs_CZ.po

@@ -229,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Dostupné příkazy:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -247,7 +247,8 @@ msgstr ""
 "Pro pohyb v seznamech a textových polích (včetně této konzole) používejte "
 "šipky a page up/down."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Pro maximalizaci/minimalizaci konzole stiskněte \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -363,7 +364,10 @@ msgstr "Smaže vybraný zápisník."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Smaže zápisník bez potvrzení."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -616,6 +620,9 @@ msgstr "Hledat ve všech poznámkách"
 msgid "View"
 msgstr "Zobrazit"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Změňit layout editoru"
 
@@ -759,7 +766,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -822,6 +829,10 @@ msgstr "Přidat či odebrat tagy"
 msgid "Switch between note and to-do type"
 msgstr "Přepnout mezi poznámkou a to-do"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1031,6 +1042,10 @@ msgstr "Nelze editovat zašifrovanou položku"
 msgid "Conflicts"
 msgstr "Konflikty"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Poznámku nelze přesunout do zápisníku \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Zápisník s tímto názvem již existuje: \"%s\""
@@ -1108,6 +1123,9 @@ msgstr "Při vytváření nové poznámky:"
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v panelu"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Globální zoom"
 
@@ -1337,11 +1355,6 @@ msgstr "Heslo nemůže být prázdné"
 msgid "Enable"
 msgstr "Zapnout"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Nebylo možné uložit zápisník: %s"
@@ -1364,6 +1377,14 @@ msgstr "Uložit změny"
 msgid "Discard changes"
 msgstr "Zahodit změny"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"

CliClient/locales/da_DK.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk."
+"dk>Language-Team: \n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +127,7 @@ msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status` and `target-status`."
 msgstr ""
-"Udfører E2EEE konfiguration. Kommandoer er `enable`(aktiver), "
+"Udfører E2EE konfiguration. Kommandoer er `enable`(aktiver), "
 "`disable`(sluk), `decrypt`(dekrypter), `status` og `target-status` (modtager-"
 "status)."
 
@@ -163,8 +163,8 @@ msgstr "Rediger note."
 msgid ""
 "No text editor is defined. Please set it using `config editor <editor-path>`"
 msgstr ""
-"Ingen tekst editor er valgt.  Vælg en ved at indstille `config editor "
-"<editor-path>`"
+"Ingen teksteditor er valgt.  Vælg en ved at indstille `config editor <editor-"
+"path>`"
 
 msgid "No active notebook."
 msgstr "Ingen aktiv notesbog."
@@ -229,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Mulige kommandoer er:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -247,7 +247,8 @@ msgstr ""
 "Brug pilene og PageUp/PageDown for at rulle lister og tekst-områder (inkl. "
 "denne konsol)"
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "For at maximere/ninimere konsollen, tryk \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -366,7 +367,10 @@ msgstr "Sletter aktuelle notesbog."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Sletter notesbogen uden at bede om bekræftelse."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Slet notesbog? Alle noter i notesbogen bliver også slettet."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -413,12 +417,14 @@ msgstr "Godkendelse  blev ikke fuldført (modtog ikke godkendelses token)."
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"For at Joplin kan synkronisere med Dropbox, skal man igennem nedenstående "
+"trin:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Trin 1: Åben denne  URL i din browser for at autorisere applikationen:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Trin 2: Indtast koden, som er oplyst af Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -433,8 +439,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
-"Låse fil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
-"kan du slette låse-filen \"%s\" og genoptage synkroniseringen."
+"Låsefil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
+"kan du slette låsefilen \"%s\" og genoptage synkroniseringen."
 
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -619,6 +625,9 @@ msgstr "Søg i alle noter"
 msgid "View"
 msgstr "Vis"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Skift editor layout"
 
@@ -689,7 +698,7 @@ msgid "Save"
 msgstr "Gem"
 
 msgid "Submit"
-msgstr ""
+msgstr "Gem"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -764,8 +773,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
+"og vejledning om hvordan det skal opsættes_"
 
 msgid "Status"
 msgstr "Status"
@@ -827,6 +838,10 @@ msgstr "Tilføj eller slet mærker"
 msgid "Switch between note and to-do type"
 msgstr "Skift mellem note-  og opgave type"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Slet"
 
@@ -885,7 +900,7 @@ msgid "OneDrive Login"
 msgstr "OneDrive login"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Dropbox Login"
 
 msgid "Options"
 msgstr "Muligheder"
@@ -923,7 +938,7 @@ msgid "Unknown flag: %s"
 msgstr "Ukendt flag: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Fil system"
@@ -1036,6 +1051,10 @@ msgstr "Krypteret emner kan ikke rettes"
 msgid "Conflicts"
 msgstr "Konflikter"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kan ikke flytte note til \"%s\" notesbog"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "En notesbog bruger allerede dette navn: \"%s\""
@@ -1113,6 +1132,9 @@ msgstr "Ved oprettelse af ny note:"
 msgid "Show tray icon"
 msgstr "Vis ikon på bundbjælke"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Global zoom procent"
 
@@ -1313,10 +1335,10 @@ msgid "Cancel synchronisation"
 msgstr "Afbryd synkronisering"
 
 msgid "New tags:"
-msgstr ""
+msgstr "Nye tags:"
 
 msgid "Type new tags or select from list"
-msgstr ""
+msgstr "Indtast nye tags eller vælg fra listen"
 
 msgid "Joplin website"
 msgstr "Joplin hjemmeside"
@@ -1342,11 +1364,6 @@ msgstr "Kodeord må ikke være tomt"
 msgid "Enable"
 msgstr "Tænd"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Notesbogen kan ikke gemmes: %s"
@@ -1369,6 +1386,14 @@ msgstr "Gem ændringer"
 msgid "Discard changes"
 msgstr "Fortryd ændringer"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Ulovlig billedtype: %s"
@@ -1416,5 +1441,12 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Se dokumentationen for nærmere oplysninger om End-To-End-kryptering "
+#~ "(E2EE) og vejledning om hvordan det skal opsættes"
+
 #~ msgid "Searches"
 #~ msgstr "Søgninger"

CliClient/locales/de_DE.po

@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Tobias Grasse <mail@tobias-grasse.net>\n"
+"Last-Translator: Philipp Zumstein <zuphilip@gmail.com>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -238,7 +238,7 @@ msgid "The possible commands are:"
 msgstr "Mögliche Befehle lauten:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -259,8 +259,8 @@ msgstr ""
 "Benutze die Pfeiltasten und Bild hoch/runter um durch Listen und Texte zu "
 "scrollen (inklusive diesem Terminal)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Um das Terminal zu maximieren/minimieren, drücke \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Um das Terminal zu maximieren/minimieren, drücke \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Um den Kommandozeilen Modus aufzurufen, drücke \":\""
@@ -379,7 +379,10 @@ msgstr "Löscht das ausgewählte Notizbuch."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Löscht das Notizbuch, ohne nach einer Bestätigung zu fragen."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Notizbuch wirklich löschen? Alle Notizen darin werden ebenfalls gelöscht."
 
@@ -432,12 +435,14 @@ msgstr ""
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Um Joplin die Synchronisation mit Dropbox zu ermöglichen, folge bitte den "
+"folgenden Schritten:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Schritt 1: URL im Browser öffnen um die Anwendung zu autorisieren:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Schritt 2: Den von Dropbox bereitgestellten Code eingeben:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -530,9 +535,8 @@ msgstr "Standard: %s"
 msgid "Possible keys/values:"
 msgstr "Mögliche Werte:"
 
-#, fuzzy
 msgid "Type `joplin help` for usage information."
-msgstr "Zeigt die Nutzungsstatistik an."
+msgstr "Gib `joplin help` ein um die Nutzungsstatistik anzuzeigen."
 
 msgid "Fatal error:"
 msgstr "Schwerwiegender Fehler:"
@@ -540,7 +544,7 @@ msgstr "Schwerwiegender Fehler:"
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
-"Das Programm wurde autorisiert - Du kannst diesen Browsertab nun schließen."
+"Das Programm wurde autorisiert - du kannst diesen Browsertab nun schließen."
 
 msgid "The application has been successfully authorised."
 msgstr "Das Programm wurde erfolgreich autorisiert."
@@ -645,6 +649,9 @@ msgstr "Alle Notizen durchsuchen"
 msgid "View"
 msgstr "Ansicht"
 
+msgid "Toggle sidebar"
+msgstr "Seitenleiste ein/aus"
+
 msgid "Toggle editor layout"
 msgstr "Editor Layout umschalten"
 
@@ -715,7 +722,7 @@ msgid "Save"
 msgstr "Speichern"
 
 msgid "Submit"
-msgstr ""
+msgstr "Absenden"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -789,8 +796,10 @@ msgstr "Die Master-Keas dieser IDs werden für die Verschlüsselung einiger ..."
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Weitere Informationen zur Ende-zu-Ende-Verschlüsselung (E2EE) und Hinweise "
+"zur Aktivierung findest du in der Dokumentation (auf Englisch):"
 
 msgid "Status"
 msgstr "Status"
@@ -832,9 +841,8 @@ msgstr "Alarm erstellen:"
 msgid "Layout"
 msgstr "Layout"
 
-#, fuzzy
 msgid "Search..."
-msgstr "Suchen"
+msgstr "Suchen..."
 
 msgid "Some items cannot be synchronised."
 msgstr "Manche Objekte können nicht synchronisiert werden."
@@ -854,6 +862,10 @@ msgstr "Markierungen hinzufügen oder entfernen"
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Löschen"
 
@@ -868,8 +880,8 @@ msgstr ""
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
-"Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf den "
-"(+) Knopf drückst."
+"Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf "
+"\"Neues Notizbuch\" drückst."
 
 msgid "Open..."
 msgstr "Öffne..."
@@ -918,7 +930,7 @@ msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Dropbox Anmeldung"
 
 msgid "Options"
 msgstr "Optionen"
@@ -957,7 +969,7 @@ msgid "Unknown flag: %s"
 msgstr "Unbekanntes Argument: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Dateisystem"
@@ -1036,9 +1048,9 @@ msgstr "Remote Objekte gelöscht: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Geladene Objekte: %d/%d."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
-msgstr "Status: \"%s\"."
+msgstr "Status: %s."
 
 msgid "Cancelling..."
 msgstr "Abbrechen..."
@@ -1070,6 +1082,10 @@ msgstr "Verschlüsselte Objekte können nicht verändert werden"
 msgid "Conflicts"
 msgstr "Konflikte"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kann Notiz nicht zu Notizbuch \"%s\" verschieben"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Ein Notizbuch mit diesem Titel existiert bereits : \"%s\""
@@ -1149,6 +1165,9 @@ msgstr "Wenn eine neue Notiz erstellt wird:"
 msgid "Show tray icon"
 msgstr "Zeige Tray Icon"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr "Hinweis: Funktioniert nicht in allen Desktopumgebungen."
+
 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
 
@@ -1277,7 +1296,7 @@ msgid ""
 "(which is displayed in brackets above)."
 msgstr ""
 "Diese Objekte verbleiben auf dem Gerät, werden aber nicht zum "
-"Synchronisationsziel hochgeladen. Um diese Objekte zu finden, suchen Sie "
+"Synchronisationsziel hochgeladen. Um diese Objekte zu finden, suchst du "
 "entweder nach dem Titel oder der ID (die oben in Klammern angezeigt wird)."
 
 msgid "Sync status (synced items / total items)"
@@ -1353,17 +1372,16 @@ msgid "Cancel synchronisation"
 msgstr "Synchronisation abbrechen"
 
 msgid "New tags:"
-msgstr ""
+msgstr "Neue Markierungen:"
 
 msgid "Type new tags or select from list"
-msgstr ""
+msgstr "Neue Markierungen eingeben oder aus der Liste auswählen"
 
 msgid "Joplin website"
 msgstr "Website von Joplin"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Mit OneDrive anmelden"
+msgstr "Mit Dropbox anmelden"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1382,11 +1400,6 @@ msgstr "Passwort darf nicht leer sein"
 msgid "Enable"
 msgstr "Aktivieren"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
@@ -1409,6 +1422,14 @@ msgstr "Änderungen speichern"
 msgid "Discard changes"
 msgstr "Änderungen verwerfen"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"

CliClient/locales/en_GB.po

@@ -210,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -223,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -332,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -556,6 +558,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -688,7 +693,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -750,6 +755,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -951,6 +959,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""
 
+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -1026,6 +1037,9 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1243,11 +1257,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1270,6 +1279,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""

CliClient/locales/es_ES.po

@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Los posibles comandos son:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -250,8 +250,8 @@ msgstr ""
 "Para desplazar en las listas y areas de texto (incluyendo la consola) "
 "utilice las flechas y re pág/av pág."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Para maximizar/minimizar la consola, presione \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Para maximizar/minimizar la consola, presione \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Para entrar a modo línea de comando, presione \":\""
@@ -368,7 +368,10 @@ msgstr "Elimina la libreta dada."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina una libreta sin pedir confirmación."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "¿Desea eliminar la libreta? Todas las notas dentro de esta libreta también "
 "serán eliminadas."
@@ -419,12 +422,14 @@ msgstr "Autenticación no completada (no se recibió token de autenticación)."
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Para permitir a Joplin sincronizar con Dropbox, por favor siga estos pasos:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr ""
+"Paso 1: Abra esta dirección en su navegador para autorizar a la aplicación:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Paso 2: Introduzca el código provisto por Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -630,6 +635,9 @@ msgstr "Buscar en todas las notas"
 msgid "View"
 msgstr "Ver"
 
+msgid "Toggle sidebar"
+msgstr "Cambia la barra lateral"
+
 msgid "Toggle editor layout"
 msgstr "Cambia el diseño del editor"
 
@@ -700,7 +708,7 @@ msgid "Save"
 msgstr "Guardar"
 
 msgid "Submit"
-msgstr ""
+msgstr "Aceptar"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -775,8 +783,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Para más información acerca del cifrado extremo a extremo (E2EE) y "
+"advertencias de como habilitarlo por favor revise la documentación:"
 
 msgid "Status"
 msgstr "Estado"
@@ -816,9 +826,8 @@ msgstr "Ajustar alarma:"
 msgid "Layout"
 msgstr "Diseño"
 
-#, fuzzy
 msgid "Search..."
-msgstr "Buscar"
+msgstr "Buscar..."
 
 msgid "Some items cannot be synchronised."
 msgstr "No se han podido sincronizar algunos de los elementos."
@@ -838,6 +847,9 @@ msgstr "Añadir o borrar etiquetas"
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre nota y lista de tareas"
 
+msgid "Copy Markdown link"
+msgstr "Copiar el enlace de Markdown"
+
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -898,7 +910,7 @@ msgid "OneDrive Login"
 msgstr "Inicio de sesión de OneDrive"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Inicio de sesión de Dropbox"
 
 msgid "Options"
 msgstr "Opciones"
@@ -936,7 +948,7 @@ msgid "Unknown flag: %s"
 msgstr "Etiqueta desconocida: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Sistema de archivos"
@@ -1015,7 +1027,7 @@ msgstr "Elementos remotos borrados: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elementos obtenidos: %d/%d."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
 msgstr "Estado: «%s»."
 
@@ -1049,6 +1061,10 @@ msgstr "Los elementos cifrados no pueden ser modificados"
 msgid "Conflicts"
 msgstr "Conflictos"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "No se ha podido mover la nota a la libreta «%s»"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Ya existe una libreta con este nombre: «%s»"
@@ -1127,6 +1143,9 @@ msgstr "Cuando se crear una nota nueva:"
 msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr "Nota: No funciona en todos los entornos de escritorio."
+
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
@@ -1328,17 +1347,16 @@ msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
 msgid "New tags:"
-msgstr ""
+msgstr "Nuevas etiquetas:"
 
 msgid "Type new tags or select from list"
-msgstr ""
+msgstr "Escriba nuevas etiquetas o seleccionelas de la lista"
 
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Acceder con OneDrive"
+msgstr "Acceder con Dropbox"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1357,11 +1375,6 @@ msgstr "La contraseña no puede estar vacía"
 msgid "Enable"
 msgstr "Habilitado"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "No se ha podido guardar esta libreta: %s"
@@ -1384,6 +1397,15 @@ msgstr "Guardar cambios"
 msgid "Discard changes"
 msgstr "Descartar cambios"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr "No hay elementos con el ID %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"La aplicación móvil de Joplin no soporta actualmente este tipo de enlace: %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
@@ -1432,6 +1454,13 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Para más información acerca del cifrado extremo a extremo (E2EE) y "
+#~ "advertencias de como habilitarlo por favor revise la documentación"
+
 #~ msgid "Searches"
 #~ msgstr "Búsquedas"
 

CliClient/locales/eu.po

@@ -227,7 +227,7 @@ msgid "The possible commands are:"
 msgstr "Litezkeen komandoak hauek dira:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -246,7 +246,8 @@ msgstr ""
 "Erabili geziak edo page up/down list eta testu guneen artean aldatzeko "
 "(kontsola hau ere kontuan izanda)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Kontsola maximizatu edo minimizatzeko, saka \"TC\" ."
 
 msgid "To enter command line mode, press \":\""
@@ -367,7 +368,10 @@ msgstr "Ezabatu emandako koadernoak."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Ezabatu koadernoak berrespenik gabe."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -629,6 +633,9 @@ msgstr "Bilatu ohar guztietan"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -776,7 +783,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -841,6 +848,9 @@ msgstr "Gehitu edo ezabatu etiketak"
 msgid "Switch between note and to-do type"
 msgstr "Aldatu oharra eta zeregin eren artean."
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -1056,6 +1066,10 @@ msgstr "Zifratutako itemak ezin aldatu daitezke"
 msgid "Conflicts"
 msgstr "Gatazkak"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Ezin eraman daiteke oharra \"%s\" koadernora"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Dagoeneko bada koaderno bat izen horrekin: \"%s\""
@@ -1138,6 +1152,9 @@ msgstr "Ohar berria sortzen du."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 #, fuzzy
 msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
@@ -1369,11 +1386,6 @@ msgstr "Pasahitza ezin utz daiteke hutsik"
 msgid "Enable"
 msgstr "Gaituta"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Koadernoa ezin gorde daiteke: %s"
@@ -1396,6 +1408,14 @@ msgstr "Gorde aldaketak"
 msgid "Discard changes"
 msgstr "Bertan behera utzi aldaketak"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"

CliClient/locales/fr_FR.po

@@ -14,6 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -229,7 +231,7 @@ msgid "The possible commands are:"
 msgstr "Les commandes possibles sont :"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -248,8 +250,8 @@ msgstr ""
 "Utilisez les touches fléchées et page précédente/suivante pour faire défiler "
 "les listes et zones de texte (y compris cette console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Pour maximiser ou minimiser la console, pressez \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Pour maximiser ou minimiser la console, pressez \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Pour démarrer le mode ligne de commande, pressez \":\""
@@ -365,10 +367,12 @@ msgstr "Supprimer le carnet."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Supprimer le carnet sans demander la confirmation."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
-"Effacer le carnet ? Toutes les notes dans ce carnet seront également "
-"effacées."
+"Effacer le carnet ? Toutes les notes et sous-carnets dans ce carnet seront "
+"également effacés."
 
 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Supprimer les notes correspondants à <note-pattern>."
@@ -631,6 +635,9 @@ msgstr "Chercher dans toutes les notes"
 msgid "View"
 msgstr "Affichage"
 
+msgid "Toggle sidebar"
+msgstr "Basculer barre latérale"
+
 msgid "Toggle editor layout"
 msgstr "Basculer l'agencement de l'éditeur"
 
@@ -779,10 +786,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
-"conseils pour l'activer, veuillez consulter la documentation"
+"conseils pour l'activer, veuillez consulter la documentation :"
 
 msgid "Status"
 msgstr "État"
@@ -845,6 +852,9 @@ msgstr "Gérer les étiquettes"
 msgid "Switch between note and to-do type"
 msgstr "Alterner entre note et tâche"
 
+msgid "Copy Markdown link"
+msgstr "Copier lien Markdown"
+
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1060,6 +1070,9 @@ msgstr "Les objets cryptés ne peuvent être modifiés"
 msgid "Conflicts"
 msgstr "Conflits"
 
+msgid "Cannot move notebook to this location"
+msgstr "Impossible de déplacer le carnet vers le carnet \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Un carnet avec ce titre existe déjà : \"%s\""
@@ -1137,6 +1150,9 @@ msgstr "Lors de la création d'une note :"
 msgid "Show tray icon"
 msgstr "Afficher icône dans la zone de notifications"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr "Note : Ne fonctionne pas dans tous les environnements de bureau."
+
 msgid "Global zoom percentage"
 msgstr "Niveau de zoom"
 
@@ -1368,13 +1384,6 @@ msgstr "Mot de passe ne peut être vide"
 msgid "Enable"
 msgstr "Activer"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-"Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
-"conseils pour l'activer, veuillez consulter la documentation :"
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Ce carnet n'a pas pu être sauvegardé : %s"
@@ -1397,6 +1406,15 @@ msgstr "Enregistrer les changements"
 msgid "Discard changes"
 msgstr "Ignorer les changements"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr "Aucun objet avec identifiant %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"L'application mobile Joplin ne gère pas pour l'instant ce type de lien : %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
@@ -1446,6 +1464,13 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+#~ "conseils pour l'activer, veuillez consulter la documentation"
+
 #~ msgid "Searches"
 #~ msgstr "Recherches"
 

CliClient/locales/hr_HR.po

@@ -229,15 +229,11 @@ msgstr ""
 msgid "The possible commands are:"
 msgstr "Moguće naredbe su:"
 
-#, fuzzy
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
-"In any command, a note or notebook can be refered to by title or ID, or "
-"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
-"note or notebook. `$c` can be used to refer to the currently selected item."
 
 msgid "To move from one pane to another, press Tab or Shift+Tab."
 msgstr "Za prijelaz iz jednog okna u drugo, pritisni Tab ili Shift+Tab."
@@ -250,7 +246,8 @@ msgstr ""
 "Use the arrows and page up/down to scroll the lists and text areas "
 "(including this console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Za maksimiziranje/minimiziranje konzole, pritisni \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -371,7 +368,10 @@ msgstr "Briše datu bilježnicu."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Briše bilježnicu bez traženja potvrde."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Obrisati bilježnicu? Sve bilješke u toj bilježnici će također biti obrisane."
 
@@ -631,6 +631,9 @@ msgstr "Pretraži u svim bilješkama"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -767,7 +770,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -833,6 +836,9 @@ msgstr "Dodaj ili makni oznake"
 msgid "Switch between note and to-do type"
 msgstr "Zamijeni bilješku i zadatak"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1044,6 +1050,10 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
 msgid "Conflicts"
 msgstr "Sukobi"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Ne mogu premjestiti bilješku u bilježnicu %s"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
@@ -1126,6 +1136,9 @@ msgstr "Stvara novu bilješku."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1350,11 +1363,6 @@ msgstr ""
 msgid "Enable"
 msgstr "Onemogućeno"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Bilježnicu nije moguće snimiti: %s"
@@ -1377,6 +1385,14 @@ msgstr "Spremi promjene"
 msgid "Discard changes"
 msgstr "Odbaci promjene"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"

CliClient/locales/it_IT.po

@@ -226,7 +226,7 @@ msgid "The possible commands are:"
 msgstr "I possibili comandi sono:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -245,7 +245,8 @@ msgstr ""
 "Usa le frecce e pagina su/giù per scorrere le liste e le aree di testo "
 "(compresa questa console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Per massimizzare/minimizzare la console, premi \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -363,7 +364,9 @@ msgstr "Elimina il seguente blocco note."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina il blocco note senza richiedere una conferma."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -613,6 +616,9 @@ msgstr "Cerca in tutte le note"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -751,7 +757,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -815,6 +821,9 @@ msgstr "Aggiungi o rimuovi etichetta"
 msgid "Switch between note and to-do type"
 msgstr "Passa da un tipo di nota a un elenco di attività"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1030,6 +1039,10 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
 msgid "Conflicts"
 msgstr "Conflitti"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Non posso spostare la nota nel blocco note \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Esiste già un blocco note col titolo \"%s\""
@@ -1112,6 +1125,9 @@ msgstr "Crea una nuova nota."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1336,11 +1352,6 @@ msgstr ""
 msgid "Enable"
 msgstr "Disabilitato"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Il blocco note non può essere salvato: %s"
@@ -1363,6 +1374,14 @@ msgstr "Salva i cambiamenti"
 msgid "Discard changes"
 msgstr "Ignora modifiche"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"

CliClient/locales/ja_JP.po

@@ -224,7 +224,7 @@ msgid "The possible commands are:"
 msgstr "有効なコマンドは："
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -240,7 +240,8 @@ msgid ""
 "(including this console)."
 msgstr "リストや入力エリアの移動には矢印キーまたはPage Up/Downを使用します。"
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "コンソールの最大化・最小化には\"TC\"と入力してください。"
 
 msgid "To enter command line mode, press \":\""
@@ -360,7 +361,10 @@ msgstr "指定されたノートブックを削除します。"
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "ノートブックを確認なしで削除します。"
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "ノートブックを削除しますか？中にあるノートはすべて消えてしまいます。"
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -614,6 +618,9 @@ msgstr "すべてのノートを検索"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -753,7 +760,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -819,6 +826,9 @@ msgstr "タグの追加・削除"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"
 
@@ -1032,6 +1042,10 @@ msgstr "いくつかの項目は同期されませんでした。"
 msgid "Conflicts"
 msgstr "衝突"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "ノートをノートブック \"%s\"に移動できませんでした。"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "\"%s\"という名前のノートブックはすでに存在しています。"
@@ -1116,6 +1130,9 @@ msgstr "あたらしいノートを作成します。"
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1340,11 +1357,6 @@ msgstr ""
 msgid "Enable"
 msgstr "無効"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "ノートブックは保存できませんでした：%s"
@@ -1367,6 +1379,14 @@ msgstr "変更を保存"
 msgid "Discard changes"
 msgstr "変更を破棄"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "サポートされていないイメージ形式: %s."

CliClient/locales/joplin.pot

@@ -210,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -223,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -332,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -556,6 +558,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -688,7 +693,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -750,6 +755,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -951,6 +959,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""
 
+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -1026,6 +1037,9 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1243,11 +1257,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1270,6 +1279,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""

CliClient/locales/nl_BE.po

@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Mogelijke commando's zijn:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -249,7 +249,8 @@ msgstr ""
 "Gebruik de pijltjes en page up/down om door de lijsten en de tekstvelden te "
 "scrollen (ook deze console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Om de console te maximaliseren/minimaliseren, typ \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -368,7 +369,10 @@ msgstr "Verwijdert het opgegeven notitieboek."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Verwijdert het notitieboek zonder te vragen om bevestiging."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
 "verwijderd worden."
@@ -631,6 +635,9 @@ msgstr "Zoek in alle notities"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -778,7 +785,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -843,6 +850,9 @@ msgstr "Voeg tag toe of verwijder tag"
 msgid "Switch between note and to-do type"
 msgstr "Wissel tussen notitie en to-do type"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1058,6 +1068,10 @@ msgstr "Versleutelde items kunnen niet aangepast worden"
 msgid "Conflicts"
 msgstr "Conflicten"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kan notitie niet naar notitieboek \"%s\" verplaatsen."
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Er bestaat al een notitieboek met \"%s\" als titel"
@@ -1142,6 +1156,9 @@ msgstr "Maakt een nieuwe notitie aan."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1371,11 +1388,6 @@ msgstr "Wachtwoord kan niet leeg zijn"
 msgid "Enable"
 msgstr "Activeer"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Het notitieboek kon niet opgeslaan worden: %s"
@@ -1398,6 +1410,14 @@ msgstr "Sla wijzigingen op"
 msgid "Discard changes"
 msgstr "Verwijder wijzigingen"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"

CliClient/locales/pt_BR.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -227,7 +227,7 @@ msgid "The possible commands are:"
 msgstr "Os comandos possíveis são:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -246,7 +246,8 @@ msgstr ""
 "Use as setas e a Page Up/Page Down para rolar as listas e áreas de texto "
 "(incluindo este console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Para maximizar / minimizar o console, pressione \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -362,7 +363,10 @@ msgstr "Exclui o caderno informado."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Exclui o caderno sem pedir confirmação."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Excluir o caderno? Todas as notas deste caderno notebook também serão "
 "excluídas."
@@ -414,12 +418,14 @@ msgstr ""
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Para permitir o Joplin sincronizar com o Dropbox, por favor, execute os "
+"seguintes passos:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Passo 1: Abra essa URL em seu navegador para autorizar:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Passo 2: Entre o código fornecido pelo Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -577,9 +583,8 @@ msgstr "Exportando para \"%s\" com o formato \"%s\". Por favor, aguarde..."
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
 
-#, fuzzy
 msgid "PDF File"
-msgstr "Arquivo"
+msgstr "Arquivo PDF"
 
 msgid "File"
 msgstr "Arquivo"
@@ -600,7 +605,7 @@ msgid "Export"
 msgstr "Exportar"
 
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #, javascript-format
 msgid "Hide %s"
@@ -627,6 +632,9 @@ msgstr "Pesquisar em todas as notas"
 msgid "View"
 msgstr "Visualizar"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
 
@@ -697,7 +705,7 @@ msgid "Save"
 msgstr "Salvar"
 
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -772,8 +780,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Para mais informações sobre Encriptação ponto-a-ponto (E2EE) e recomendações "
+"sobre como habilitar, favor verificar a documentação:"
 
 msgid "Status"
 msgstr "Status"
@@ -814,9 +824,8 @@ msgstr "Definir alarme:"
 msgid "Layout"
 msgstr "Layout"
 
-#, fuzzy
 msgid "Search..."
-msgstr "Procurar"
+msgstr "Pesquisar..."
 
 msgid "Some items cannot be synchronised."
 msgstr "Alguns itens não podem ser sincronizados."
@@ -836,6 +845,10 @@ msgstr "Adicionar ou remover tags"
 msgid "Switch between note and to-do type"
 msgstr "Alternar entre os tipos Nota e Tarefa"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Excluir"
 
@@ -896,7 +909,7 @@ msgid "OneDrive Login"
 msgstr "Login no OneDrive"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Login no Dropbox"
 
 msgid "Options"
 msgstr "Opções"
@@ -936,7 +949,7 @@ msgid "Unknown flag: %s"
 msgstr "Flag desconhecido: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Sistema de arquivos"
@@ -1015,7 +1028,7 @@ msgstr "Itens remotos excluídos: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Itens pesquisados: %d/%d."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
 msgstr "Estado: \"%s\"."
 
@@ -1026,15 +1039,15 @@ msgstr "Cancelando..."
 msgid "Completed: %s"
 msgstr "Completado: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Last error: %s"
-msgstr "Erro fatal:"
+msgstr "Último erro: %s"
 
 msgid "Idle"
-msgstr ""
+msgstr "Inativo"
 
 msgid "In progress"
-msgstr ""
+msgstr "Em andamento"
 
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
@@ -1049,6 +1062,10 @@ msgstr "Itens encriptados não podem ser modificados"
 msgid "Conflicts"
 msgstr "Conflitos"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Não é possível mover a nota para o caderno \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Já existe caderno com este título: \"%s\""
@@ -1127,6 +1144,9 @@ msgstr "Quando criar uma nota nova:"
 msgid "Show tray icon"
 msgstr "Exibir tray icon"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Porcentagem global do zoom"
 
@@ -1328,17 +1348,16 @@ msgid "Cancel synchronisation"
 msgstr "Cancelar sincronização"
 
 msgid "New tags:"
-msgstr ""
+msgstr "Novas tags:"
 
 msgid "Type new tags or select from list"
-msgstr ""
+msgstr "Digite novsa tags, ou selecione da lista"
 
 msgid "Joplin website"
 msgstr "Site do Joplin"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Login com OneDrive"
+msgstr "Login com Dropbox"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1357,11 +1376,6 @@ msgstr "Senha não pode ser vazia"
 msgid "Enable"
 msgstr "Habilitar"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "O caderno não pôde ser salvo: %s"
@@ -1384,6 +1398,14 @@ msgstr "Gravar alterações"
 msgid "Discard changes"
 msgstr "Descartar alterações"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"

CliClient/locales/ru_RU.po

@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Доступные команды:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -249,7 +249,8 @@ msgstr ""
 "Используйте стрелки и клавиши перелистывания страницы вверх/вниз для "
 "прокрутки списков и текстовых областей (включая эту консоль)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Чтобы развернуть/свернуть консоль, нажимайте «TC»."
 
 msgid "To enter command line mode, press \":\""
@@ -368,7 +369,10 @@ msgstr "Удаляет заданный блокнот."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Удаляет блокнот без запроса подтверждения."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Удалить блокнот? Все заметки в этом блокноте также будут удалены."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -628,6 +632,9 @@ msgstr "Поиск во всех заметках"
 msgid "View"
 msgstr "Вид"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Переключить вид редактора"
 
@@ -775,7 +782,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -838,6 +845,10 @@ msgstr "Добавить или удалить теги"
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1049,6 +1060,10 @@ msgstr "Зашифрованные элементы не могут быть и
 msgid "Conflicts"
 msgstr "Конфликты"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Не удалось переместить заметку в блокнот «%s»"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Блокнот с таким названием уже существует: «%s»"
@@ -1126,6 +1141,9 @@ msgstr "При создании новой заметки:"
 msgid "Show tray icon"
 msgstr "Показывать иконку в панели задач"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Глобальный масштаб в процентах"
 
@@ -1356,11 +1374,6 @@ msgstr "Пароль не может быть пустым"
 msgid "Enable"
 msgstr "Включено"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Не удалось сохранить блокнот: %s"
@@ -1383,6 +1396,14 @@ msgstr "Сохранить изменения"
 msgid "Discard changes"
 msgstr "Отменить изменения"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"

CliClient/package.json

@@ -58,9 +58,10 @@
     "strip-ansi": "^4.0.0",
     "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
-    "tkwidgets": "^0.5.25",
+    "tkwidgets": "^0.5.26",
     "url-parse": "^1.2.0",
     "uuid": "^3.0.1",
+    "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",
     "xml2js": "^0.4.19",
     "yargs-parser": "^7.0.0"

CliClient/run_test.sh

@@ -9,7 +9,7 @@ rsync -a "$ROOT_DIR/build/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
 if [[ $TEST_FILE == "" ]]; then
-	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/services_InteropService.js)
+	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/models_Note.js tests-build/models_Folder.js tests-build/services_InteropService.js)
 else
 	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
 fi

CliClient/tests/models_Folder.js

@@ -0,0 +1,55 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+async function allItems() {
+	let folders = await Folder.all();
+	let notes = await Note.all();
+	return folders.concat(notes);
+}
+
+describe('models_Folder', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should tell if a notebook can be nested under another one', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let f3 = await Folder.save({ title: "folder3", parent_id: f2.id });
+		let f4 = await Folder.save({ title: "folder4" });
+
+		expect(await Folder.canNestUnder(f1.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f2.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f4.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, f3.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f2.id)).toBe(true);
+		expect(await Folder.canNestUnder(f1.id, '')).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, '')).toBe(true);
+	}));
+
+	it('should recursively delete notes and sub-notebooks', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let n1 = await Note.save({ title: 'note1', parent_id: f2.id });
+
+		await Folder.delete(f1.id);
+
+		const all = await allItems();
+		expect(all.length).toBe(0);
+	}));
+
+});

CliClient/tests/models_Note.js

@@ -0,0 +1,39 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('models_Note', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should find resource and note IDs', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		let items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(1);
+		expect(items[0].id).toBe(note1.id);
+
+		await shim.attachFileToNote(note2, __dirname + '/../tests/support/photo.jpg');
+		note2 = await Note.load(note2.id);
+		items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(2);
+		expect(items[0].type_).toBe(BaseModel.TYPE_NOTE);
+		expect(items[1].type_).toBe(BaseModel.TYPE_RESOURCE);
+	}));
+
+});

CliClient/tests/services_InteropService.js

@@ -180,7 +180,7 @@ describe('services_InteropService', function() {
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
 		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
 		note1 = await Note.load(note1.id);
-		let resourceIds = Note.linkedResourceIds(note1.body);
+		let resourceIds = await Note.linkedResourceIds(note1.body);
 		let resource1 = await Resource.load(resourceIds[0]);
 
 		await service.export({ path: filePath });
@@ -193,7 +193,7 @@ describe('services_InteropService', function() {
 
 		let note2 = (await Note.all())[0];
 		expect(note2.body).not.toBe(note1.body);
-		resourceIds = Note.linkedResourceIds(note2.body);
+		resourceIds = await Note.linkedResourceIds(note2.body);
 		expect(resourceIds.length).toBe(1);
 		let resource2 = await Resource.load(resourceIds[0]);
 		expect(resource2.id).not.toBe(resource1.id);
@@ -249,4 +249,28 @@ describe('services_InteropService', function() {
 		expect(folder2.title).toBe('folder1');
 	}));
 
+	it('should export and import links to notes', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Note.delete(note2.id);
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(2);
+		expect(await Folder.count()).toBe(1);
+
+		let note1_2 = await Note.loadByTitle('ma note');
+		let note2_2 = await Note.loadByTitle('ma deuxième note');
+
+		expect(note2_2.body.indexOf(note1_2.id) >= 0).toBe(true);
+	}));
+
 });

ElectronClient/app/ElectronAppWrapper.js

@@ -9,9 +9,10 @@ const fs = require('fs-extra');
 
 class ElectronAppWrapper {
 
-	constructor(electronApp, env) {
+	constructor(electronApp, env, profilePath) {
 		this.electronApp_ = electronApp;
 		this.env_ = env;
+		this.profilePath_ = profilePath;
 		this.win_ = null;
 		this.willQuitApp_ = false;
 		this.tray_ = null;
@@ -37,12 +38,16 @@ class ElectronAppWrapper {
 	createWindow() {
 		const windowStateKeeper = require('electron-window-state');
 
-		// Load the previous state with fallback to defaults
-		const windowState = windowStateKeeper({
+		const stateOptions = {
 			defaultWidth: 800,
 			defaultHeight: 600,
 			file: 'window-state-' + this.env_ + '.json',
-		});
+		}
+
+		if (this.profilePath_) stateOptions.path = this.profilePath_;
+
+		// Load the previous state with fallback to defaults
+		const windowState = windowStateKeeper(stateOptions);
 
 		const windowOptions = {
 			x: windowState.x,

ElectronClient/app/app.js

@@ -38,6 +38,7 @@ const appDefaultState = Object.assign({}, defaultState, {
 	fileToImport: null,
 	windowCommand: null,
 	noteVisiblePanes: ['editor', 'viewer'],
+	sidebarVisibility: true,
 	windowContentSize: bridge().windowContentSize(),
 });
 
@@ -85,7 +86,7 @@ class Application extends BaseApplication {
 
 						action = newAction;
 					}
-					
+
 					if (!goingBack) newNavHistory.push(currentRoute);
 					newState.navHistory = newNavHistory
 					newState.route = action;
@@ -123,11 +124,22 @@ class Application extends BaseApplication {
 					break;
 
 				case 'NOTE_VISIBLE_PANES_SET':
-				
+
 					newState = Object.assign({}, state);
 					newState.noteVisiblePanes = action.panes;
 					break;
 
+				case 'SIDEBAR_VISIBILITY_TOGGLE':
+
+					newState = Object.assign({}, state);
+					newState.sidebarVisibility = !state.sidebarVisibility;
+					break;
+
+				case 'SIDEBAR_VISIBILITY_SET':
+					newState = Object.assign({}, state);
+					newState.sidebarVisibility = action.visibility;
+					break;
+
 			}
 		} catch (error) {
 			error.message = 'In reducer: ' + error.message + ' Action: ' + JSON.stringify(action);
@@ -152,7 +164,7 @@ class Application extends BaseApplication {
 		}
 
 		if (["NOTE_UPDATE_ONE", "NOTE_DELETE", "FOLDER_UPDATE_ONE", "FOLDER_DELETE"].indexOf(action.type) >= 0) {
-			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(5, { syncSteps: ["update_remote", "delete_remote"] });
+			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(30, { syncSteps: ["update_remote", "delete_remote"] });
 		}
 
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
@@ -170,6 +182,10 @@ class Application extends BaseApplication {
 			Setting.setValue('noteVisiblePanes', newState.noteVisiblePanes);
 		}
 
+		if (['SIDEBAR_VISIBILITY_TOGGLE', 'SIDEBAR_VISIBILITY_SET'].indexOf(action.type) >= 0) {
+			Setting.setValue('sidebarVisibility', newState.sidebarVisibility);
+		}
+
 		return result;
 	}
 
@@ -195,7 +211,7 @@ class Application extends BaseApplication {
 					Setting.setValue('notes.sortOrder.field', field);
 					this.refreshMenu();
 				}
-			});		
+			});
 		}
 
 		const importItems = [];
@@ -273,7 +289,7 @@ class Application extends BaseApplication {
 				this.dispatch({
 					type: 'WINDOW_COMMAND',
 					name: 'exportPdf',
-				});				
+				});
 			}
 		});
 
@@ -349,17 +365,17 @@ class Application extends BaseApplication {
 				label: _('Edit'),
 				submenu: [{
 					label: _('Copy'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'copy',
 					accelerator: 'CommandOrControl+C',
 				}, {
 					label: _('Cut'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'cut',
 					accelerator: 'CommandOrControl+X',
 				}, {
 					label: _('Paste'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
 				}, {
@@ -379,6 +395,16 @@ class Application extends BaseApplication {
 			}, {
 				label: _('View'),
 				submenu: [{
+					label: _('Toggle sidebar'),
+					screens: ['Main'],
+					accelerator: 'F10',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'toggleSidebar',
+						});
+					}
+				}, {
 					label: _('Toggle editor layout'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+L',
@@ -510,11 +536,6 @@ class Application extends BaseApplication {
 	}
 
 	updateTray() {
-		// Tray icon (called AppIndicator) doesn't work in Ubuntu
-		// http://www.webupd8.org/2017/04/fix-appindicator-not-working-for.html
-		// Might be fixed in Electron 18.x but no non-beta release yet.
-		if (!shim.isWindows() && !shim.isMac()) return;
-
 		const app = bridge().electronApp();
 
 		if (app.trayShown() === Setting.value('showTrayIcon')) return;
@@ -547,6 +568,12 @@ class Application extends BaseApplication {
 	}
 
 	async start(argv) {
+		const electronIsDev = require('electron-is-dev');
+
+		// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
+		// insert an extra argument so that they can be processed in a consistent way everywhere.
+		if (!electronIsDev) argv.splice(1, 0, '.');
+
 		argv = await super.start(argv);
 
 		AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
@@ -588,6 +615,11 @@ class Application extends BaseApplication {
 			id: Setting.value('activeFolderId'),
 		});
 
+		this.store().dispatch({
+			type: 'FOLDER_SET_COLLAPSED_ALL',
+			ids: Setting.value('collapsedFolderIds'),
+		});
+
 		// Note: Auto-update currently doesn't work in Linux: it downloads the update
 		// but then doesn't install it on exit.
 		if (shim.isWindows() || shim.isMac()) {
@@ -596,7 +628,7 @@ class Application extends BaseApplication {
 					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath());
 				}
 			}
-			
+
 			// Initial check on startup
 			setTimeout(() => { runAutoUpdateCheck() }, 5000);
 			// Then every x hours
@@ -633,4 +665,4 @@ function app() {
 	return application_;
 }
 
-module.exports = { app };
+module.exports = { app };

ElectronClient/app/checkForUpdates.js

@@ -43,7 +43,7 @@ async function fetchLatestRelease() {
 	for (let i = 0; i < json.assets.length; i++) {
 		const asset = json.assets[i];
 		let found = false;
-		if (platform === 'win32' && asset.name.indexOf('.exe') >= 0) {
+		if (platform === 'win32' && asset.name.indexOf('.exe') >= 0 && asset.name.indexOf('Setup') >= 0) {
 			found = true;
 		} else if (platform === 'darwin' && asset.name.indexOf('.dmg') >= 0) {
 			found = true;

ElectronClient/app/gui/Header.jsx

@@ -72,9 +72,10 @@ class HeaderComponent extends React.Component {
 		if (options.iconName) {
 			const iconStyle = {
 				fontSize: Math.round(style.fontSize * 1.4),
-				color: style.color
+				color: style.color,
 			};
 			if (options.title) iconStyle.marginRight = 5;
+			if (options.iconRotation) iconStyle.transform = 'rotate(' + options.iconRotation + 'deg)';
 			icon = <i style={iconStyle} className={"fa " + options.iconName}></i>
 		}
 

ElectronClient/app/gui/MainScreen.jsx

@@ -25,7 +25,7 @@ class MainScreenComponent extends React.Component {
 			modalLayer: {
 				visible: false,
 				message: '',
-			},
+			}
 		});
 	}
 
@@ -41,6 +41,12 @@ class MainScreenComponent extends React.Component {
 		});
 	}
 
+	toggleSidebar() {
+		this.props.dispatch({
+			type: 'SIDEBAR_VISIBILITY_TOGGLE',
+		});
+	}
+
 	async doCommand(command) {
 		if (!command) return;
 
@@ -83,7 +89,7 @@ class MainScreenComponent extends React.Component {
 						if (answer) {
 							let folder = null;
 							try {
-								folder = await Folder.save({ title: answer }, { userSideValidation: true });		
+								folder = await Folder.save({ title: answer }, { userSideValidation: true });
 							} catch (error) {
 								bridge().showErrorMessageBox(error.message);
 							}
@@ -160,9 +166,11 @@ class MainScreenComponent extends React.Component {
 					id: this.searchId_,
 				});
 			}
-			
+
 		} else if (command.name === 'toggleVisiblePanes') {
 			this.toggleVisiblePanes();
+		} else if (command.name === 'toggleSidebar') {
+			this.toggleSidebar();
 		} else if (command.name === 'showModalMessage') {
 			this.setState({ modalLayer: { visible: true, message: command.message } });
 		} else if (command.name === 'hideModalMessage') {
@@ -203,7 +211,7 @@ class MainScreenComponent extends React.Component {
 						this.setState({ promptOptions: null });
 					}
 				},
-			});	
+			});
 		} else {
 			commandProcessed = false;
 		}
@@ -216,8 +224,8 @@ class MainScreenComponent extends React.Component {
 		}
 	}
 
-	styles(themeId, width, height, messageBoxVisible) {
-		const styleKey = themeId + '_' + width + '_' + height + '_' + messageBoxVisible;
+	styles(themeId, width, height, messageBoxVisible, isSidebarVisible) {
+		const styleKey = themeId + '_' + width + '_' + height + '_' + messageBoxVisible + '_' + (+isSidebarVisible);
 		if (styleKey === this.styleKey_) return this.styles_;
 
 		const theme = themeStyle(themeId);
@@ -246,7 +254,12 @@ class MainScreenComponent extends React.Component {
 			height: rowHeight,
 			display: 'inline-block',
 			verticalAlign: 'top',
-		};
+    };
+
+		if (isSidebarVisible === false) {
+			this.styles_.sideBar.width = 0;
+			this.styles_.sideBar.display = 'none';
+		}
 
 		this.styles_.noteList = {
 			width: Math.floor(layoutUtils.size(width * .2, 150, 300)),
@@ -287,20 +300,28 @@ class MainScreenComponent extends React.Component {
 		const folders = this.props.folders;
 		const notes = this.props.notes;
 		const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
-		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible);
+		const sidebarVisibility = this.props.sidebarVisibility;
+		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility);
 		const theme = themeStyle(this.props.theme);
 		const selectedFolderId = this.props.selectedFolderId;
 		const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
 
 		const headerItems = [];
 
+		headerItems.push({
+			title: _('Toggle sidebar'),
+			iconName: 'fa-bars',
+			iconRotation: this.props.sidebarVisibility ? 0 : 90,
+			onClick: () => { this.doCommand({ name: 'toggleSidebar'}) }
+		});
+
 		headerItems.push({
 			title: _('New note'),
 			iconName: 'fa-file-o',
 			enabled: !!folders.length && !onConflictFolder,
 			onClick: () => { this.doCommand({ name: 'newNote' }) },
 		});
-				
+
 		headerItems.push({
 			title: _('New to-do'),
 			iconName: 'fa-check-square-o',
@@ -400,14 +421,16 @@ const mapStateToProps = (state) => {
 		theme: state.settings.theme,
 		windowCommand: state.windowCommand,
 		noteVisiblePanes: state.noteVisiblePanes,
+		sidebarVisibility: state.sidebarVisibility,
 		folders: state.folders,
 		notes: state.notes,
 		hasDisabledSyncItems: state.hasDisabledSyncItems,
 		showMissingMasterKeyMessage: state.notLoadedMasterKeys.length && state.masterKeys.length,
 		selectedFolderId: state.selectedFolderId,
+		sidebarVisibility: state.sidebarVisibility,
 	};
 };
 
 const MainScreen = connect(mapStateToProps)(MainScreenComponent);
 
-module.exports = { MainScreen };
+module.exports = { MainScreen };

ElectronClient/app/gui/NoteList.jsx

@@ -96,6 +96,16 @@ class NoteListComponent extends React.Component {
 				}
 			}}));
 
+			menu.append(new MenuItem({label: _('Copy Markdown link'), click: async () => {
+				const { clipboard } = require('electron');
+				const links = [];
+				for (let i = 0; i < noteIds.length; i++) {
+					const note = await Note.load(noteIds[i]);
+					links.push(Note.markdownTag(note));
+				}
+				clipboard.writeText(links.join(' '));
+			}}));
+
 			const exportMenu = new Menu();
 
 			const ioService = new InteropService();

ElectronClient/app/gui/NoteText.jsx

@@ -1,5 +1,6 @@
 const React = require('react');
 const Note = require('lib/models/Note.js');
+const BaseItem = require('lib/models/BaseItem.js');
 const BaseModel = require('lib/BaseModel.js');
 const Search = require('lib/models/Search.js');
 const { time } = require('lib/time-utils.js');
@@ -76,7 +77,6 @@ class NoteTextComponent extends React.Component {
 	mdToHtml() {
 		if (this.mdToHtml_) return this.mdToHtml_;
 		this.mdToHtml_ = new MdToHtml({
-			supportsResourceLinks: true,
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
 		return this.mdToHtml_;
@@ -210,10 +210,22 @@ class NoteTextComponent extends React.Component {
 			}
 
 			if (this.editor_) {
-				const session = this.editor_.editor.getSession();
-				const undoManager = session.getUndoManager();
-				undoManager.reset();
-				session.setUndoManager(undoManager);
+				// Calling setValue here does two things:
+				// 1. It sets the initial value as recorded by the undo manager. If we were to set it instead to "" and wait for the render
+				//    phase to set the value, the initial value would still be "", which means pressing "undo" on a note that has just loaded
+				//    would clear it.
+				// 2. It resets the undo manager - fixes https://github.com/laurent22/joplin/issues/355
+				// Note: calling undoManager.reset() doesn't work
+				try {
+					this.editor_.editor.getSession().setValue(note ? note.body : '');
+				} catch (error) {
+					if (error.message === "Cannot read property 'match' of undefined") {
+						// The internals of Ace Editor throws an exception when creating a new note,
+						// but that can be ignored.
+					} else {
+						console.error(error);
+					}
+				}
 				this.editor_.editor.clearSelection();
 				this.editor_.editor.moveCursorTo(0,0);
 			}
@@ -322,11 +334,29 @@ class NoteTextComponent extends React.Component {
 
 			menu.popup(bridge().window());
 		} else if (msg.indexOf('joplin://') === 0) {
-			const resourceId = msg.substr('joplin://'.length);
-			Resource.load(resourceId).then((resource) => {
-				const filePath = Resource.fullPath(resource);
+			const itemId = msg.substr('joplin://'.length);
+			const item = await BaseItem.loadItemById(itemId);
+
+			if (!item) throw new Error('No item with ID ' + itemId);
+
+			if (item.type_ === BaseModel.TYPE_RESOURCE) {
+				const filePath = Resource.fullPath(item);
 				bridge().openItem(filePath);
-			});
+			} else if (item.type_ === BaseModel.TYPE_NOTE) {
+				this.props.dispatch({
+					type: "FOLDER_SELECT",
+					id: item.parent_id,
+				});
+
+				setTimeout(() => {
+					this.props.dispatch({
+						type: 'NOTE_SELECT',
+						id: item.id,
+					});
+				}, 10);
+			} else {
+				throw new Error('Unsupported item type: ' + item.type_);
+			}
 		} else {
 			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}
@@ -500,6 +530,7 @@ class NoteTextComponent extends React.Component {
 				});
 			} catch (error) {
 				reg.logger().error(error);
+				bridge().showErrorMessageBox(error.message);
 			}
 		}
 	}

ElectronClient/app/gui/Root.jsx

@@ -47,6 +47,11 @@ async function initialize(dispatch) {
 		type: 'NOTE_VISIBLE_PANES_SET',
 		panes: Setting.value('noteVisiblePanes'),
 	});
+
+	store.dispatch({
+		type: 'SIDEBAR_VISIBILITY_SET',
+		visibility: Setting.value('sidebarVisibility')
+	});
 }
 
 class RootComponent extends React.Component {

ElectronClient/app/gui/SideBar.jsx

@@ -14,6 +14,57 @@ const MenuItem = bridge().MenuItem;
 const InteropServiceHelper = require("../InteropServiceHelper.js");
 
 class SideBarComponent extends React.Component {
+
+
+	constructor() {
+		super();
+
+		this.onFolderDragStart_ = (event) => {
+			const folderId = event.currentTarget.getAttribute('folderid');
+			if (!folderId) return;
+			
+			event.dataTransfer.setDragImage(new Image(), 1, 1);
+			event.dataTransfer.clearData();
+			event.dataTransfer.setData('text/x-jop-folder-ids', JSON.stringify([folderId]));
+		};
+
+		this.onFolderDragOver_ = (event) => {
+			if (event.dataTransfer.types.indexOf("text/x-jop-note-ids") >= 0) event.preventDefault();
+			if (event.dataTransfer.types.indexOf("text/x-jop-folder-ids") >= 0) event.preventDefault();
+		};
+
+		this.onFolderDrop_ = async (event) => {
+			const folderId = event.currentTarget.getAttribute('folderid');
+			const dt = event.dataTransfer;
+			if (!dt) return;
+
+			if (dt.types.indexOf("text/x-jop-note-ids") >= 0) {
+				event.preventDefault();
+
+				const noteIds = JSON.parse(dt.getData("text/x-jop-note-ids"));
+				for (let i = 0; i < noteIds.length; i++) {
+					await Note.moveToFolder(noteIds[i], folderId);
+				}
+			} else if (dt.types.indexOf("text/x-jop-folder-ids") >= 0) {
+				event.preventDefault();
+
+				const folderIds = JSON.parse(dt.getData("text/x-jop-folder-ids"));
+				for (let i = 0; i < folderIds.length; i++) {
+					await Folder.moveToFolder(folderIds[i], folderId);
+				}
+			}
+		};
+
+		this.onFolderToggleClick_ = async (event) => {
+			const folderId = event.currentTarget.getAttribute('folderid');
+
+			this.props.dispatch({
+				type: 'FOLDER_TOGGLE',
+				id: folderId,
+			});
+		};
+	}
+
 	style() {
 		const theme = themeStyle(this.props.theme);
 
@@ -23,23 +74,39 @@ class SideBarComponent extends React.Component {
 			root: {
 				backgroundColor: theme.backgroundColor2,
 			},
-			listItem: {
+			listItemContainer: {
+				boxSizing: "border-box",
 				height: itemHeight,
+				// paddingLeft: 14,
+				display: "flex",
+				alignItems: "stretch",
+			},
+			listItem: {
 				fontFamily: theme.fontFamily,
 				fontSize: theme.fontSize,
 				textDecoration: "none",
-				boxSizing: "border-box",
 				color: theme.color2,
-				paddingLeft: 14,
-				display: "flex",
-				alignItems: "center",
 				cursor: "default",
 				opacity: 0.8,
 				whiteSpace: "nowrap",
+				display: "flex",
+				flex: 1,
+				alignItems: 'center',
 			},
 			listItemSelected: {
 				backgroundColor: theme.selectedColor2,
 			},
+			listItemExpandIcon: {
+				color: theme.color2,
+				cursor: "default",
+				opacity: 0.8,
+				// fontFamily: theme.fontFamily,
+				fontSize: theme.fontSize,
+				textDecoration: "none",
+				paddingRight: 5,
+				display: "flex",
+				alignItems: 'center',
+			},
 			conflictFolder: {
 				color: theme.colorError2,
 				fontWeight: "bold",
@@ -89,6 +156,10 @@ class SideBarComponent extends React.Component {
 			},
 		};
 
+		style.tagItem = Object.assign({}, style.listItem);
+		style.tagItem.paddingLeft = 23;
+		style.tagItem.height = itemHeight;
+
 		return style;
 	}
 
@@ -101,7 +172,7 @@ class SideBarComponent extends React.Component {
 
 		let deleteMessage = "";
 		if (itemType === BaseModel.TYPE_FOLDER) {
-			deleteMessage = _("Delete notebook? All notes within this notebook will also be deleted.");
+			deleteMessage = _("Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.");
 		} else if (itemType === BaseModel.TYPE_TAG) {
 			deleteMessage = _("Remove this tag from all the notes?");
 		} else if (itemType === BaseModel.TYPE_SEARCH) {
@@ -150,6 +221,19 @@ class SideBarComponent extends React.Component {
 				})
 			);
 
+			// menu.append(
+			// 	new MenuItem({
+			// 		label: _("Move"),
+			// 		click: async () => {
+			// 			this.props.dispatch({
+			// 				type: "WINDOW_COMMAND",
+			// 				name: "renameFolder",
+			// 				id: itemId,
+			// 			});
+			// 		},
+			// 	})
+			// );
+
 			menu.append(new MenuItem({ type: "separator" }));
 
 			const InteropService = require("lib/services/InteropService.js");
@@ -194,53 +278,51 @@ class SideBarComponent extends React.Component {
 		await shared.synchronize_press(this);
 	}
 
-	folderItem(folder, selected) {
+	folderItem(folder, selected, hasChildren, depth) {
 		let style = Object.assign({}, this.style().listItem);
-		if (selected) style = Object.assign(style, this.style().listItemSelected);
 		if (folder.id === Folder.conflictFolderId()) style = Object.assign(style, this.style().conflictFolder);
 
-		const onDragOver = (event, folder) => {
-			if (event.dataTransfer.types.indexOf("text/x-jop-note-ids") >= 0) event.preventDefault();
-		};
-
-		const onDrop = async (event, folder) => {
-			if (event.dataTransfer.types.indexOf("text/x-jop-note-ids") < 0) return;
-			event.preventDefault();
-
-			const noteIds = JSON.parse(event.dataTransfer.getData("text/x-jop-note-ids"));
-			for (let i = 0; i < noteIds.length; i++) {
-				await Note.moveToFolder(noteIds[i], folder.id);
-			}
-		};
-
 		const itemTitle = Folder.displayTitle(folder);
 
+		let containerStyle = Object.assign({}, this.style().listItemContainer);
+		// containerStyle.paddingLeft = containerStyle.paddingLeft + depth * 10;
+
+		if (selected) containerStyle = Object.assign(containerStyle, this.style().listItemSelected);
+
+		let expandLinkStyle = Object.assign({}, this.style().listItemExpandIcon);
+		let expandIconStyle = {
+			visibility: hasChildren ? 'visible' : 'hidden',
+			paddingLeft: 8 + depth * 10,
+		}
+
+		const iconName = this.props.collapsedFolderIds.indexOf(folder.id) >= 0 ? 'fa-plus-square' : 'fa-minus-square';
+		const expandIcon = <i style={expandIconStyle} className={"fa " + iconName}></i>
+		const expandLink = hasChildren ? <a style={expandLinkStyle} href="#" folderid={folder.id} onClick={this.onFolderToggleClick_}>{expandIcon}</a> : <span style={expandLinkStyle}>{expandIcon}</span>
+
 		return (
-			<a
-				className="list-item"
-				onDragOver={event => {
-					onDragOver(event, folder);
-				}}
-				onDrop={event => {
-					onDrop(event, folder);
-				}}
-				href="#"
-				data-id={folder.id}
-				data-type={BaseModel.TYPE_FOLDER}
-				onContextMenu={event => this.itemContextMenu(event)}
-				key={folder.id}
-				style={style}
-				onClick={() => {
-					this.folderItem_click(folder);
-				}}
-			>
-				{itemTitle}
-			</a>
+			<div className="list-item-container" style={containerStyle} key={folder.id} onDragStart={this.onFolderDragStart_} onDragOver={this.onFolderDragOver_} onDrop={this.onFolderDrop_} draggable={true} folderid={folder.id}>
+				{ expandLink }
+				<a
+					className="list-item"
+					href="#"
+					data-id={folder.id}
+					data-type={BaseModel.TYPE_FOLDER}
+					onContextMenu={event => this.itemContextMenu(event)}
+					style={style}
+					folderid={folder.id}
+					onClick={() => {
+						this.folderItem_click(folder);
+					}}
+					onDoubleClick={this.onFolderToggleClick_}
+				>
+					{itemTitle}
+				</a>
+			</div>
 		);
 	}
 
 	tagItem(tag, selected) {
-		let style = Object.assign({}, this.style().listItem);
+		let style = Object.assign({}, this.style().tagItem);
 		if (selected) style = Object.assign(style, this.style().listItemSelected);
 		return (
 			<a
@@ -285,11 +367,11 @@ class SideBarComponent extends React.Component {
 		return <div style={{ height: 2, backgroundColor: "blue" }} key={key} />;
 	}
 
-	makeHeader(key, label, iconName) {
+	makeHeader(key, label, iconName, extraProps = {}) {
 		const style = this.style().header;
 		const icon = <i style={{ fontSize: style.fontSize * 1.2, marginRight: 5 }} className={"fa " + iconName} />;
 		return (
-			<div style={style} key={key}>
+			<div style={style} key={key} {...extraProps}>
 				{icon}
 				{label}
 			</div>
@@ -326,7 +408,10 @@ class SideBarComponent extends React.Component {
 
 		let items = [];
 
-		items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-folder-o"));
+		items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-folder-o", {
+			onDrop: this.onFolderDrop_,
+			folderid: '',
+		}));
 
 		if (this.props.folders.length) {
 			const folderItems = shared.renderFolders(this.props, this.folderItem.bind(this));
@@ -345,18 +430,6 @@ class SideBarComponent extends React.Component {
 			);
 		}
 
-		// if (this.props.searches.length) {
-		// 	items.push(this.makeHeader("searchHeader", _("Searches"), "fa-search"));
-
-		// 	const searchItems = shared.renderSearches(this.props, this.searchItem.bind(this));
-
-		// 	items.push(
-		// 		<div className="searches" key="search_items">
-		// 			{searchItems}
-		// 		</div>
-		// 	);
-		// }
-
 		let lines = Synchronizer.reportToLines(this.props.syncReport);
 		const syncReportText = [];
 		for (let i = 0; i < lines.length; i++) {
@@ -396,6 +469,7 @@ const mapStateToProps = state => {
 		notesParentType: state.notesParentType,
 		locale: state.settings.locale,
 		theme: state.settings.theme,
+		collapsedFolderIds: state.collapsedFolderIds,
 	};
 };
 

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

@@ -124,17 +124,17 @@
 		loadAndApplyHljs();
 
 		// Remove the bullet from "ul" for checkbox lists and extra padding
-		const checkboxes = document.getElementsByClassName('checkbox');
-		for (let i = 0; i < checkboxes.length; i++) {
-			const cb = checkboxes[i];
-			const ul = cb.parentElement.parentElement;
-			if (!ul) {
-				console.warn('Unexpected layout for checkbox');
-				continue;
-			}
-			ul.style.listStyleType = 'none';
-			ul.style.paddingLeft = 0;
-		}
+		// const checkboxes = document.getElementsByClassName('checkbox');
+		// for (let i = 0; i < checkboxes.length; i++) {
+		// 	const cb = checkboxes[i];
+		// 	const ul = cb.parentElement.parentElement;
+		// 	if (!ul) {
+		// 		console.warn('Unexpected layout for checkbox');
+		// 		continue;
+		// 	}
+		// 	ul.style.listStyleType = 'none';
+		// 	ul.style.paddingLeft = 0;
+		// }
 
 		let previousContentHeight = contentElement.scrollHeight;
 		let startTime = Date.now();

ElectronClient/app/main.js

@@ -24,11 +24,22 @@ function envFromArgs(args) {
 	return 'prod';
 }
 
+// Likewise, we want to know if a profile is specified early, in particular
+// to save the window state data.
+function profileFromArgs(args) {
+	if (!args) return null;
+	const profileIndex = args.indexOf('--profile');
+	if (profileIndex <= 0 || profileIndex >= args.length - 1) return null;
+	const profileValue = args[profileIndex + 1];
+	return profileValue ? profileValue : null;
+}
+
 Logger.fsDriver_ = new FsDriverNode();
 
 const env = envFromArgs(process.argv);
+const profilePath = profileFromArgs(process.argv);
 
-const wrapper = new ElectronAppWrapper(electronApp, env);
+const wrapper = new ElectronAppWrapper(electronApp, env, profilePath);
 
 initBridge(wrapper);
 

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.81",
+  "version": "1.0.89",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -26,7 +26,23 @@
       "build/icons/*"
     ],
     "win": {
-      "icon": "../../Assets/Joplin.ico"
+      "icon": "../../Assets/Joplin.ico",
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64",
+            "ia32"
+          ]
+        },
+        {
+          "target": "portable",
+          "arch": [
+            "x64",
+            "ia32"
+          ]
+        }
+      ]
     },
     "nsis": {
       "oneClick": false,
@@ -48,7 +64,7 @@
     "babel-cli": "^6.26.0",
     "babel-preset-react": "^6.24.1",
     "electron": "^1.7.11",
-    "electron-builder": "^20.5.1"
+    "electron-builder": "^20.10.0"
   },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1",
@@ -61,6 +77,7 @@
     "base-64": "^0.1.0",
     "compare-versions": "^3.1.0",
     "electron-context-menu": "^0.9.1",
+    "electron-is-dev": "^0.3.0",
     "electron-window-state": "^4.1.1",
     "follow-redirects": "^1.2.5",
     "form-data": "^2.3.1",
@@ -87,7 +104,6 @@
     "react-dom": "^16.0.0",
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
-    "sharp": "^0.17.3",
     "smalltalk": "^2.5.1",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^3.1.13",
@@ -97,6 +113,7 @@
     "tcp-port-used": "^0.1.2",
     "url-parse": "^1.2.0",
     "uuid": "^3.1.0",
+    "valid-url": "^1.0.9",
     "xml2js": "^0.4.19"
   }
 }

ElectronClient/app/style.css

@@ -34,17 +34,15 @@ table td, table th {
 	background-color: rgba(0,160,255,0.1) !important;
 }
 
-.side-bar .list-item:hover,
+/*.side-bar .list-item:hover,
 .side-bar .synchronize-button:hover {
-	/*background-color: #453E53;*/
 	background-color: #01427B;
 }
 
 .side-bar .list-item:active,
 .side-bar .synchronize-button:active {
-	/*background-color: #564B6C;*/
 	background-color: #0465BB;
-}
+}*/
 
 .editor-toolbar .button:not(.disabled):hover,
 .header .button:not(.disabled):hover {

README.md

@@ -18,33 +18,26 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 ## Desktop applications
 
-Operating System | Download
------------------|--------
-Windows (64-bit only)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.81/Joplin-Setup-1.0.81.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a>
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.81/Joplin-1.0.81.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a>
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.81/Joplin-1.0.81-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a>
+Operating System | Download | Alternative
+-----------------|--------|-------------------
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.89/Joplin-1.0.89.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | 
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.89/Joplin-1.0.89.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.89/Joplin-1.0.89-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).
 
 ## Mobile applications
 
 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.116/joplin-v1.0.116.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.123/joplin-v1.0.123.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
 
-On macOS:
-
-	brew install joplin
-
-On Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)):
-
-**Important:** First, [install Node 8+](https://nodejs.org/en/download/package-manager/). Node 8 is LTS but not yet available everywhere so you might need to manually install it.
-
-	NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin
-	sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
-
-By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work.
+Operating system | Method
+-----------------|----------------
+macOS            | `brew install joplin`
+Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)) | **Important:** First, [install Node 8+](https://nodejs.org/en/download/package-manager/). Node 8 is LTS but not yet available everywhere so you might need to manually install it.<br/><br/>`NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin`<br/>`sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin`<br><br>By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work.
+Arch Linux | An Arch Linux package is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild).
 
 To start it, type `joplin`.
 
@@ -61,9 +54,11 @@ For usage information, please refer to the full [Joplin Terminal Application Doc
 
 - Support
 
+	- [Joplin Forum](https://discourse.joplin.cozic.net)
 	- [How to enable end-to-end encryption](https://github.com/laurent22/joplin/blob/master/readme/e2ee.md)
 	- [End-to-end encryption spec](https://github.com/laurent22/joplin/blob/master/readme/spec.md)
 	- [How to enable debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md)
+	- [FAQ](https://github.com/laurent22/joplin/blob/master/readme/faq.md)
 
 - About
 
@@ -139,7 +134,7 @@ On the **desktop application** or **mobile application**, go to the config scree
 
 On the **terminal application**, you will need to set the `sync.target` config variable and all the `sync.5.path`, `sync.5.username` and `sync.5.password` config variables to, respectively the Nextcloud WebDAV URL, your username and your password. This can be done from the command line mode using:
 
-	:config sync.5.path https://example.com/nextcloud/remote.php/dav/files/USERNAME/Joplin
+	:config sync.5.path https://example.com/nextcloud/remote.php/webdav/Joplin
 	:config sync.5.username YOUR_USERNAME
 	:config sync.5.password YOUR_PASSWORD
 	:config sync.target 5
@@ -188,6 +183,10 @@ For a more technical description, mostly relevant for development or to review t
 
 Any kind of file can be attached to a note. In Markdown, links to these files are represented as a simple ID to the resource. In the note viewer, these files, if they are images, will be displayed or, if they are other files (PDF, text files, etc.) they will be displayed as links. Clicking on this link will open the file in the default application.
 
+Resources that are not attached to any note will be automatically deleted after a day or two.
+
+**Important:** Resources larger than 10 MB are not currently supported on mobile. They will crash the application when synchronising so it is recommended not to attach such resources at the moment. The issue is being looked at.
+
 # Notifications
 
 On the desktop and mobile apps, an alarm can be associated with any to-do. It will be triggered at the given time by displaying a notification. How the notification will be displayed depends on the operating system since each has a different way to handle this. Please see below for the requirements for the desktop applications:
@@ -202,10 +201,28 @@ On mobile, the alarms will be displayed using the built-in notification system.
 
 If for any reason the notifications do not work, please [open an issue](https://github.com/laurent22/joplin/issues).
 
+# Sub-notebooks
+
+Sub-notebooks allow organising multiple notebooks into a tree of notebooks. For example it can be used to regroup all the notebooks related to work, to family or to a particular project under a parent notebook.
+
+![](https://joplin.cozic.net/images/SubNotebooks.png)
+
+- On the **desktop application**, to create a subnotebook, drag and drop it onto another notebook. To move it back to the root, drag and drop it on the "Notebooks" header. Currently only the desktop app can be used to organise the notebooks.
+- The **mobile application** supports displaying and collapsing/expanding the tree of notebooks, however it does not currently support moving the subnotebooks to different notebooks.
+- The **terminal app** supports displaying the tree of subnotebooks but it does not support collapsing/expanding them or moving the subnotebooks around.
+
 # Markdown
 
 Joplin uses and renders [Github-flavoured Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) with a few variations and additions. In particular:
 
+## Links to other notes
+
+You can create a link to a note by specifying its ID in the URL. For example:
+
+	[Link to my note](:/0b0d62d15e60409dac34f354b6e9e839)
+
+Since getting the ID of a note is not straightforward, each app provides a way to create such link. In the **desktop app**, right click on a note an select "Copy Markdown link". In the **mobile app**, open a note and, in the top right menu, select "Copy Markdown link". You can then paste this link anywhere in another note.
+
 ## Math notation
 
 Math expressions can be added using the [Katex notation](https://khan.github.io/KaTeX/). To add an inline equation, wrap the expression in `$EXPRESSION$`, eg. `$\sqrt{3x-1}+(1+x)^2$`. To create an expression block, wrap it as follow:
@@ -242,6 +259,12 @@ Donations to Joplin support the development of the project. Developing quality a
 
 Please see the [donation page](https://joplin.cozic.net/donate/) for information on how to support the development of Joplin.
 
+# Community
+
+- For general discussion about Joplin, user support, software development questions, and to discuss new features, go to the [Joplin Forum](https://discourse.joplin.cozic.net/). It is possible to login with your GitHub account.
+- For bug reports and feature requests, go to the [GitHub Issue Tracker](https://github.com/laurent22/joplin/issues).
+- The latest news are often posted [on this Twitter account](https://twitter.com/laurent2233).
+
 # Contributing
 
 Please see the guide for information on how to contribute to the development of Joplin: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
@@ -264,25 +287,26 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  77%
-![](https://joplin.cozic.net/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić <trbuhom@net.hr>  |  62%
-![](https://joplin.cozic.net/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt <lukas@aiya.cz>  |  97%
-![](https://joplin.cozic.net/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |    |  96%
-![](https://joplin.cozic.net/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Tobias Grasse <mail@tobias-grasse.net>  |  96%
+![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  75%
+![](https://joplin.cozic.net/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić <trbuhom@net.hr>  |  61%
+![](https://joplin.cozic.net/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt <lukas@aiya.cz>  |  95%
+![](https://joplin.cozic.net/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.  |  97%
+![](https://joplin.cozic.net/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Philipp Zumstein <zuphilip@gmail.com>  |  98%
 ![](https://joplin.cozic.net/images/flags/country-4x3/gb.png)  |  English  |  [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po)  |    |  100%
-![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Fernando Martín <f@mrtn.es>  |  96%
-![](https://joplin.cozic.net/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  100%
-![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  José Antonio Martínez <facemoshistoria@gmail.com>  |  100%
-![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  64%
-![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  77%
-![](https://joplin.cozic.net/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos <rnbastos@gmail.com>  |  95%
-![](https://joplin.cozic.net/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov <artyom.karlov@gmail.com>  |  96%
-![](https://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |  RCJacH <RCJacH@outlook.com>  |  64%
-![](https://joplin.cozic.net/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |    |  62%
+![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Fernando Martín <f@mrtn.es>  |  99%
+![](https://joplin.cozic.net/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  98%
+![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans <marcoslansgarza@gmail.com>  |  95%
+![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  63%
+![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  76%
+![](https://joplin.cozic.net/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos <rnbastos@gmail.com>  |  97%
+![](https://joplin.cozic.net/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov <artyom.karlov@gmail.com>  |  94%
+![](https://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  91%
+![](https://joplin.cozic.net/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |    |  61%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Known bugs
 
+- Resources larger than 10 MB are not currently supported on mobile. They will crash the application so it is recommended not to attach such resources at the moment. The issue is being looked at.
 - Non-alphabetical characters such as Chinese or Arabic might create glitches in the terminal on Windows. This is a limitation of the current Windows console.
 - It is only possible to upload files of up to 4MB to OneDrive due to a limitation of [the API](https://docs.microsoft.com/en-gb/onedrive/developer/rest-api/api/driveitem_put_content) being currently used. There is currently no plan to support OneDrive "large file" API.
 

ReactNativeClient/android/app/build.gradle

@@ -89,9 +89,9 @@ android {
 	defaultConfig {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
-		targetSdkVersion 22
-		versionCode 2097294
-		versionName "1.0.116"
+		targetSdkVersion 26
+		versionCode 2097301
+		versionName "1.0.123"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/android/app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
 
 	<uses-sdk
 		android:minSdkVersion="16"
-		android:targetSdkVersion="22" />
+		android:targetSdkVersion="26" />
 
 	<application
 		android:name=".MainApplication"

ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj

@@ -306,6 +306,34 @@
 			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
 			remoteInfo = "double-conversion";
 		};
+		4D7F8DA020A32BA0008B757D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
+			remoteInfo = jsinspector;
+		};
+		4D7F8DA220A32BA0008B757D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
+			remoteInfo = "jsinspector-tvOS";
+		};
+		4D7F8DA420A32BA0008B757D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
+			remoteInfo = privatedata;
+		};
+		4D7F8DA620A32BA0008B757D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
+			remoteInfo = "privatedata-tvOS";
+		};
 		4DA7F80C1FC1DA9C00353191 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */;
@@ -540,10 +568,14 @@
 				4D2AFF8D1FDA002000599716 /* libcxxreact.a */,
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
 				4D2AFF8F1FDA002000599716 /* libjschelpers.a */,
+				4D7F8DA120A32BA0008B757D /* libjsinspector.a */,
+				4D7F8DA320A32BA0008B757D /* libjsinspector-tvOS.a */,
 				4D3A19271FBDDA9400457703 /* libthird-party.a */,
 				4D2AFF911FDA002000599716 /* libthird-party.a */,
 				4D3A192B1FBDDA9400457703 /* libdouble-conversion.a */,
 				4D2AFF931FDA002000599716 /* libdouble-conversion.a */,
+				4D7F8DA520A32BA0008B757D /* libprivatedata.a */,
+				4D7F8DA720A32BA0008B757D /* libprivatedata-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1150,6 +1182,34 @@
 			remoteRef = 4D3A192A1FBDDA9400457703 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		4D7F8DA120A32BA0008B757D /* libjsinspector.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsinspector.a;
+			remoteRef = 4D7F8DA020A32BA0008B757D /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		4D7F8DA320A32BA0008B757D /* libjsinspector-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsinspector-tvOS.a";
+			remoteRef = 4D7F8DA220A32BA0008B757D /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		4D7F8DA520A32BA0008B757D /* libprivatedata.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libprivatedata.a;
+			remoteRef = 4D7F8DA420A32BA0008B757D /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		4D7F8DA720A32BA0008B757D /* libprivatedata-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libprivatedata-tvOS.a";
+			remoteRef = 4D7F8DA620A32BA0008B757D /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		4DA7F80D1FC1DA9C00353191 /* libRNImagePicker.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;

ReactNativeClient/ios/Joplin/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0.19</string>
+	<string>10.0.21</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>21</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

ReactNativeClient/lib/BaseApplication.js

@@ -19,6 +19,7 @@ const BaseSyncTarget = require('lib/BaseSyncTarget.js');
 const { fileExtension } = require('lib/path-utils.js');
 const { shim } = require('lib/shim.js');
 const { _, setLocale, defaultLocale, closestSupportedLocale } = require('lib/locale.js');
+const reduxSharedMiddleware = require('lib/components/shared/reduxSharedMiddleware');
 const os = require('os');
 const fs = require('fs-extra');
 const JoplinError = require('lib/JoplinError');
@@ -143,6 +144,14 @@ class BaseApplication {
 				continue;
 			}
 
+			if (arg.indexOf('-psn') === 0) {
+				// Some weird flag passed by macOS - can be ignored.
+				// https://github.com/laurent22/joplin/issues/480
+				// https://stackoverflow.com/questions/10242115
+				argv.splice(0, 1);
+				continue;
+			}
+
 			if (arg.length && arg[0] == '-') {
 				throw new JoplinError(_('Unknown flag: %s', arg), 'flagError');
 			} else {
@@ -262,6 +271,8 @@ class BaseApplication {
 		const newState = store.getState();
 		let refreshNotes = false;
 
+		reduxSharedMiddleware(store, next, action);
+
 		if (action.type == 'FOLDER_SELECT' || action.type === 'FOLDER_DELETE' || (action.type === 'SEARCH_UPDATE' && newState.notesParentType === 'Folder')) {
 			Setting.setValue('activeFolderId', newState.selectedFolderId);
 			this.currentFolder_ = newState.selectedFolderId ? await Folder.load(newState.selectedFolderId) : null;
@@ -368,11 +379,11 @@ class BaseApplication {
 		let initArgs = startFlags.matched;
 		if (argv.length) this.showPromptString_ = false;
 
-		if (process.argv[1].indexOf('joplindev') >= 0) {
-			if (!initArgs.profileDir) initArgs.profileDir = '/mnt/d/Temp/TestNotes2';
-			initArgs.logLevel = Logger.LEVEL_DEBUG;
-			initArgs.env = 'dev';
-		}
+		// if (process.argv[1].indexOf('joplindev') >= 0) {
+		// 	if (!initArgs.profileDir) initArgs.profileDir = '/mnt/d/Temp/TestNotes2';
+		// 	initArgs.logLevel = Logger.LEVEL_DEBUG;
+		// 	initArgs.env = 'dev';
+		// }
 
 		let appName = initArgs.env == 'dev' ? 'joplindev' : 'joplin';
 		if (Setting.value('appId').indexOf('-desktop') >= 0) appName += '-desktop';
@@ -429,7 +440,7 @@ class BaseApplication {
 				Setting.setValue('autoUpdateEnabled', 0);
 				Setting.setValue('sync.interval', 3600);
 			}
-			
+
 			Setting.setValue('firstStart', 0);
 		} else {
 			setLocale(Setting.value('locale'));

ReactNativeClient/lib/BaseModel.js

@@ -44,6 +44,15 @@ class BaseModel {
 		return null;
 	}
 
+	// Prefer the use of this function to compare IDs as it handles the case where
+	// one ID is null and the other is "", in which case they are actually considered to be the same.
+	static idsEqual(id1, id2) {
+		if (!id1 && !id2) return true;
+		if (!id1 && !!id2) return false;
+		if (!!id1 && !id2) return false;
+		return id1 === id2;
+	}
+
 	static modelTypeToName(type) {
 		for (let i = 0; i < BaseModel.typeEnum_.length; i++) {
 			const e = BaseModel.typeEnum_[i];

ReactNativeClient/lib/MdToHtml.js

@@ -14,7 +14,6 @@ class MdToHtml {
 	constructor(options = null) {
 		if (!options) options = {};
 
-		this.supportsResourceLinks_ = !!options.supportsResourceLinks;
 		this.loadedResources_ = {};
 		this.cachedContent_ = null;
 		this.cachedContentKey_ = null;
@@ -132,35 +131,27 @@ class MdToHtml {
 		const isResourceUrl = Resource.isResourceUrl(href);
 		const title = isResourceUrl ? this.getAttr_(attrs, 'title') : href;
 
-		if (isResourceUrl && !this.supportsResourceLinks_) {
-			// In mobile, links to local resources, such as PDF, etc. currently aren't supported.
-			// Ideally they should be opened in the user's browser.
-			return '<span style="opacity: 0.5">(Resource not yet supported: '; //+ htmlentities(text) + ']';
+		let resourceIdAttr = "";
+		let icon = "";
+		let hrefAttr = '#';
+		if (isResourceUrl) {
+			const resourceId = Resource.pathToId(href);
+			href = "joplin://" + resourceId;
+			resourceIdAttr = "data-resource-id='" + resourceId + "'";
+			icon = '<span class="resource-icon"></span>';
 		} else {
-			let resourceIdAttr = "";
-			let icon = "";
-			if (isResourceUrl) {
-				const resourceId = Resource.pathToId(href);
-				href = "joplin://" + resourceId;
-				resourceIdAttr = "data-resource-id='" + resourceId + "'";
-				icon = '<span class="resource-icon"></span>';
-			}
-
-			const js = options.postMessageSyntax + "(" + JSON.stringify(href) + "); return false;";
-			let output = "<a " + resourceIdAttr + " title='" + htmlentities(title) + "' href='#' onclick='" + js + "'>" + icon;
-			return output;
+			// If the link is a plain URL (as opposed to a resource link), set the href to the actual
+			// link. This allows the link to be exported too when exporting to PDF. 
+			hrefAttr = href;
 		}
+
+		const js = options.postMessageSyntax + "(" + JSON.stringify(href) + "); return false;";
+		let output = "<a " + resourceIdAttr + " title='" + htmlentities(title) + "' href='" + hrefAttr + "' onclick='" + js + "'>" + icon;
+		return output;
 	}
 
 	renderCloseLink_(attrs, options) {
-		const href = this.getAttr_(attrs, 'href');
-		const isResourceUrl = Resource.isResourceUrl(href);
-
-		if (isResourceUrl && !this.supportsResourceLinks_) {
-			return ')</span>';
-		} else {
-			return '</a>';
-		}
+		return '</a>';
 	}
 
 	rendererPlugin_(language) {
@@ -220,12 +211,7 @@ class MdToHtml {
 
 			if (isCodeBlock) rendererPlugin = this.rendererPlugin_(codeBlockLanguage);
 
-			if (previousToken && previousToken.tag === 'li' && tag === 'p') {
-				// Markdown-it render list items as <li><p>Text<p></li> which makes it
-				// complicated to style and layout the HTML, so we remove this extra
-				// <p> here and below in closeTag.
-				openTag = null;
-			} else if (isInlineCode) {
+			if (isInlineCode) {
 				openTag = null;
 			} else if (tag && t.type.indexOf('html_inline') >= 0) {
 				openTag = null;
@@ -420,8 +406,8 @@ class MdToHtml {
 
 		if (HORRIBLE_HACK) {
 			let counter = -1;
-			while (body.indexOf('- [ ]') >= 0 || body.indexOf('- [X]') >= 0) {
-				body = body.replace(/- \[(X| )\]/, function(v, p1) {
+			while (body.indexOf('- [ ]') >= 0 || body.indexOf('- [X]') >= 0 || body.indexOf('- [x]') >= 0) {
+				body = body.replace(/- \[(X| |x)\]/, function(v, p1) {
 					let s = p1 == ' ' ? 'NOTICK' : 'TICK';
 					counter++;
 					return '- mJOPmCHECKBOXm' + s + 'm' + counter + 'm';
@@ -490,6 +476,9 @@ class MdToHtml {
 			ul {
 				padding-left: 1.3em;
 			}
+			li p {
+				margin-bottom: 0;
+			}
 			.resource-icon {
 				display: inline-block;
 				position: relative;
@@ -577,10 +566,10 @@ class MdToHtml {
 
 	toggleTickAt(body, index) {
 		let counter = -1;
-		while (body.indexOf('- [ ]') >= 0 || body.indexOf('- [X]') >= 0) {
+		while (body.indexOf('- [ ]') >= 0 || body.indexOf('- [X]') >= 0 || body.indexOf('- [x]') >= 0) {
 			counter++;
 
-			body = body.replace(/- \[(X| )\]/, function(v, p1) {
+			body = body.replace(/- \[(X| |x)\]/, function(v, p1) {
 				let s = p1 == ' ' ? 'NOTICK' : 'TICK';
 				if (index == counter) {
 					s = s == 'NOTICK' ? 'TICK' : 'NOTICK';

ReactNativeClient/lib/MdToHtml_Katex.js

@@ -11,7 +11,9 @@ class MdToHtml_Katex {
 
 	processContent(renderedTokens, content, tagType) {
 		try {
-			let renderered = katex.renderToString(content);
+			let renderered = katex.renderToString(content, {
+				displayMode: tagType === 'block',
+			});
 
 			if (tagType === 'block') renderered = '<p>' + renderered + '</p>';
 

ReactNativeClient/lib/components/Dropdown.js

@@ -10,7 +10,7 @@ class Dropdown extends React.Component {
 		this.headerRef_ = null;
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.setState({
 			headerSize: { x: 0, y: 0, width: 0, height: 0 },
 			listVisible: false,

ReactNativeClient/lib/components/ItemList.js

@@ -34,7 +34,7 @@ class ItemList extends React.Component {
 		});
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.setState({
 			topItemIndex: 0,
 			bottomItemIndex: 0,
@@ -45,7 +45,7 @@ class ItemList extends React.Component {
 		this.updateStateItemIndexes();
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		if (newProps.itemHeight) {
 			this.setState({
 				itemHeight: newProps.itemHeight,

ReactNativeClient/lib/components/action-button.js

@@ -26,7 +26,7 @@ class ActionButtonComponent extends React.Component {
 		};
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		if ('buttonIndex' in newProps) {
 			this.setState({ buttonIndex: newProps.buttonIndex });
 		}

ReactNativeClient/lib/components/app-nav.js

@@ -16,7 +16,7 @@ class AppNavComponent extends Component {
 		}
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		if (Platform.OS === 'ios') {
 			this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this.keyboardDidShow.bind(this));
 			this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this.keyboardDidHide.bind(this));

ReactNativeClient/lib/components/checkbox.js

@@ -19,11 +19,11 @@ class Checkbox extends Component {
 		}
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.setState({ checked: this.props.checked });
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		if ('checked' in newProps) {
 			this.setState({ checked: newProps.checked });
 		}

ReactNativeClient/lib/components/global-style.js

@@ -16,6 +16,7 @@ const globalStyle = {
 	selectedColor: '#e5e5e5',
 	disabledOpacity: 0.2,
 	colorUrl: '#000CFF',
+	textSelectionColor: "#0096FF",
 
 	raisedBackgroundColor: "#0080EF",
 	raisedColor: "#003363",
@@ -99,7 +100,10 @@ function addExtraStyles(style) {
 }
 
 function themeStyle(theme) {
-	if (!theme) throw new Error('Theme not set');
+	if (!theme) {
+		console.warn('Theme not set!! Defaulting to Light theme');
+		theme = Setting.THEME_LIGHT;
+	}
 
 	if (themeCache_[theme]) return themeCache_[theme];
 
@@ -111,6 +115,7 @@ function themeStyle(theme) {
 	output.colorFaded = '#777777';
 	output.dividerColor = '#555555';
 	output.selectedColor = '#333333';
+	output.textSelectionColor = '#00AEFF';
 
 	output.raisedBackgroundColor = "#0F2051";
 	output.raisedColor = "#788BC3";

ReactNativeClient/lib/components/note-body-viewer.js

@@ -1,5 +1,5 @@
 const React = require('react'); const Component = React.Component;
-const { Platform, WebView, View, Linking } = require('react-native');
+const { Platform, WebView, View } = require('react-native');
 const { globalStyle } = require('lib/components/global-style.js');
 const Resource = require('lib/models/Resource.js');
 const Setting = require('lib/models/Setting.js');
@@ -18,8 +18,8 @@ class NoteBodyViewer extends Component {
 		this.isMounted_ = false;
 	}
 
-	componentWillMount() {
-		this.mdToHtml_ = new MdToHtml({ supportsResourceLinks: false });
+	UNSAFE_componentWillMount() {
+		this.mdToHtml_ = new MdToHtml();
 		this.isMounted_ = true;
 	}
 
@@ -115,7 +115,7 @@ class NoteBodyViewer extends Component {
 							//msg = msg.split(':');
 							//this.bodyScrollTop_ = Number(msg[1]);
 						} else {
-							Linking.openURL(msg);
+							this.props.onJoplinLinkClick(msg);
 						}
 					}}
 				/>

ReactNativeClient/lib/components/note-list.js

@@ -68,12 +68,12 @@ class NoteListComponent extends Component {
 		return output;
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		const newDataSource = this.state.dataSource.cloneWithRows(this.filterNotes(this.props.items));
 		this.setState({ dataSource: newDataSource });
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		// https://stackoverflow.com/questions/38186114/react-native-redux-and-listview
 		this.setState({
 			dataSource: this.state.dataSource.cloneWithRows(this.filterNotes(newProps.items)),

ReactNativeClient/lib/components/screen-header.js

@@ -99,7 +99,8 @@ class ScreenHeaderComponent extends Component {
 				height: 18,
 			},
 			contextMenuTrigger: {
-				fontSize: 25,
+				fontSize: 30,
+				paddingLeft: 10,
 				paddingRight: theme.marginRight,
 				color: theme.raisedColor,
 				fontWeight: 'bold',
@@ -445,7 +446,7 @@ class ScreenHeaderComponent extends Component {
 		const menuComp = !showContextMenuButton ? null : (
 			<Menu onSelect={(value) => this.menu_select(value)} style={this.styles().contextMenu}>
 				<MenuTrigger style={{ paddingTop: PADDING_V, paddingBottom: PADDING_V }}>
-					<Text style={this.styles().contextMenuTrigger}>  &#8942;</Text>
+					<Icon name='md-more' style={this.styles().contextMenuTrigger} />
 				</MenuTrigger>
 				<MenuOptions>
 					<ScrollView style={{ maxHeight: windowHeight }}>

ReactNativeClient/lib/components/screens/NoteTagsDialog.js

@@ -96,7 +96,7 @@ class NoteTagsDialogComponent extends React.Component {
 		}
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		const noteId = this.props.noteId;
 		this.setState({ noteId: noteId });
 		this.loadNoteTags(noteId);
@@ -164,7 +164,7 @@ class NoteTagsDialogComponent extends React.Component {
 		const dialogContent = (
 			<View style={{flex:1}}>
 				<View style={this.styles().newTagBox}>
-					<Text style={this.styles().newTagBoxLabel}>{_('New tags:')}</Text><TextInput value={this.state.newTags} onChangeText={value => { this.setState({ newTags: value }) }} style={this.styles().newTagBoxInput}/>
+					<Text style={this.styles().newTagBoxLabel}>{_('New tags:')}</Text><TextInput selectionColor={theme.textSelectionColor} value={this.state.newTags} onChangeText={value => { this.setState({ newTags: value }) }} style={this.styles().newTagBoxInput}/>
 				</View>
 				<FlatList
 					data={this.state.tagListData}

ReactNativeClient/lib/components/screens/config.js

@@ -31,7 +31,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		};
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.setState({ settings: this.props.settings });
 	}
 
@@ -165,7 +165,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 			return (
 				<View key={key} style={this.styles().settingContainer}>
 					<Text key="label" style={this.styles().settingText}>{md.label()}</Text>
-					<TextInput autoCapitalize="none" key="control" style={this.styles().settingControl} value={value} onChangeText={(value) => updateSettingValue(key, value)} secureTextEntry={!!md.secure} />
+					<TextInput selectionColor={theme.textSelectionColor} autoCapitalize="none" key="control" style={this.styles().settingControl} value={value} onChangeText={(value) => updateSettingValue(key, value)} secureTextEntry={!!md.secure} />
 				</View>
 			);
 		} else {

ReactNativeClient/lib/components/screens/dropbox-login.js

@@ -23,7 +23,7 @@ class DropboxLoginScreenComponent extends BaseScreenComponent {
 		);
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.shared_.refreshUrl();
 	}
 
@@ -62,7 +62,7 @@ class DropboxLoginScreenComponent extends BaseScreenComponent {
 						</TouchableOpacity>
 					</View>
 					<Text style={this.styles().stepText}>{_('Step 2: Enter the code provided by Dropbox:')}</Text>
-					<TextInput value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/>
+					<TextInput selectionColor={theme.textSelectionColor} value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/>
 
 					<Button disabled={this.state.checkingAuthToken} title={_("Submit")} onPress={this.shared_.submit_click}></Button>
 				</View>

ReactNativeClient/lib/components/screens/encryption-config.js

@@ -48,11 +48,11 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 		return shared.refreshStats(this);
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.initState(this.props);
 	}
 
-	componentWillReceiveProps(nextProps) {
+	UNSAFE_componentWillReceiveProps(nextProps) {
 		this.initState(nextProps);
 	}
 
@@ -122,7 +122,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 				<Text style={this.styles().normalText}>{_('Created: %s', time.formatMsToLocal(mk.created_time))}</Text>
 				<View style={{flexDirection: 'row', alignItems: 'center'}}>
 					<Text style={{flex:0, fontSize: theme.fontSize, marginRight: 10, color: theme.color}}>{_('Password:')}</Text>
-					<TextInput secureTextEntry={true} value={password} onChangeText={(text) => onPasswordChange(text)} style={inputStyle}></TextInput>
+					<TextInput selectionColor={theme.textSelectionColor} secureTextEntry={true} value={password} onChangeText={(text) => onPasswordChange(text)} style={inputStyle}></TextInput>
 					<Text style={{fontSize: theme.fontSize, marginRight: 10, color: theme.color}}>{passwordOk}</Text>
 					<Button title={_('Save')} onPress={() => onSaveClick()}></Button>
 				</View>
@@ -147,7 +147,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 		return (
 			<View style={{flex:1, borderColor: theme.dividerColor, borderWidth: 1, padding: 10, marginTop: 10, marginBottom: 10}}>
 				<Text style={{fontSize: theme.fontSize, color: theme.color}}>{_('Enabling encryption means *all* your notes and attachments are going to be re-synchronised and sent encrypted to the sync target. Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.')}</Text>
-				<TextInput style={{margin: 10, color: theme.color, borderWidth: 1, borderColor: theme.dividerColor }} secureTextEntry={true} value={this.state.passwordPromptAnswer} onChangeText={(text) => { this.setState({ passwordPromptAnswer: text }) }}></TextInput>
+				<TextInput selectionColor={theme.textSelectionColor} style={{margin: 10, color: theme.color, borderWidth: 1, borderColor: theme.dividerColor }} secureTextEntry={true} value={this.state.passwordPromptAnswer} onChangeText={(text) => { this.setState({ passwordPromptAnswer: text }) }}></TextInput>
 				<View style={{flexDirection: 'row'}}>
 					<View style={{flex:1 , marginRight:10}} >
 						<Button title={_('Enable')} onPress={() => { onEnableClick() }}></Button>

ReactNativeClient/lib/components/screens/folder.js

@@ -43,7 +43,7 @@ class FolderScreenComponent extends BaseScreenComponent {
 		return this.styles_[this.props.theme];
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		if (!this.props.folderId) {
 			const folder = Folder.new();
 			this.setState({
@@ -103,6 +103,7 @@ class FolderScreenComponent extends BaseScreenComponent {
 
 	render() {
 		let saveButtonDisabled = !this.isModified();
+		const theme = themeStyle(this.props.theme);
 
 		return (
 			<View style={this.rootStyle(this.props.theme).root}>
@@ -112,7 +113,7 @@ class FolderScreenComponent extends BaseScreenComponent {
 					saveButtonDisabled={saveButtonDisabled}
 					onSaveButtonPress={() => this.saveFolderButton_press()}
 				/>
-				<TextInput style={this.styles().textInput} autoFocus={true} value={this.state.folder.title} onChangeText={(text) => this.title_changeText(text)} />
+				<TextInput selectionColor={theme.textSelectionColor} style={this.styles().textInput} autoFocus={true} value={this.state.folder.title} onChangeText={(text) => this.title_changeText(text)} />
 				<dialogs.DialogBox ref={dialogbox => { this.dialogbox = dialogbox }}/>
 			</View>
 		);

ReactNativeClient/lib/components/screens/log.js

@@ -61,7 +61,7 @@ class LogScreenComponent extends BaseScreenComponent {
 		return this.styles_[this.props.theme];
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.resfreshLogEntries();
 	}
 

ReactNativeClient/lib/components/screens/note.js

@@ -1,9 +1,10 @@
 const React = require('react'); const Component = React.Component;
-const { Platform, Keyboard, BackHandler, View, Button, TextInput, WebView, Text, StyleSheet, Linking, Image } = require('react-native');
+const { Platform, Clipboard, Keyboard, BackHandler, View, Button, TextInput, WebView, Text, StyleSheet, Linking, Image } = require('react-native');
 const { connect } = require('react-redux');
 const { uuid } = require('lib/uuid.js');
 const RNFS = require('react-native-fs');
 const Note = require('lib/models/Note.js');
+const BaseItem = require('lib/models/BaseItem.js');
 const Setting = require('lib/models/Setting.js');
 const Resource = require('lib/models/Resource.js');
 const Folder = require('lib/models/Folder.js');
@@ -22,8 +23,8 @@ const { _ } = require('lib/locale.js');
 const { reg } = require('lib/registry.js');
 const { shim } = require('lib/shim.js');
 const { BaseScreenComponent } = require('lib/components/base-screen.js');
-const { dialogs } = require('lib/dialogs.js');
 const { globalStyle, themeStyle } = require('lib/components/global-style.js');
+const { dialogs } = require('lib/dialogs.js');
 const DialogBox = require('react-native-dialogbox').default;
 const { NoteBodyViewer } = require('lib/components/note-body-viewer.js');
 const RNFetchBlob = require('react-native-fetch-blob').default;
@@ -107,6 +108,39 @@ class NoteScreenComponent extends BaseScreenComponent {
 		this.noteTagDialog_closeRequested = () => {
 			this.setState({ noteTagDialogShown: false });
 		}
+
+		this.onJoplinLinkClick_ = async (msg) => {
+			try {
+				if (msg.indexOf('joplin://') === 0) {
+					const itemId = msg.substr('joplin://'.length);
+					const item = await BaseItem.loadItemById(itemId);
+					if (!item) throw new Error(_('No item with ID %s', itemId));
+
+					if (item.type_ === BaseModel.TYPE_NOTE) {
+						// Easier to just go back, then go to the note since
+						// the Note screen doesn't handle reloading a different note
+
+						this.props.dispatch({
+							type: 'NAV_BACK',
+						});
+
+						setTimeout(() => {
+							this.props.dispatch({
+								type: 'NAV_GO',
+								routeName: 'Note',
+								noteId: item.id,
+							});
+						}, 5);
+					} else {
+						throw new Error(_('The Joplin mobile app does not currently support this type of link: %s', BaseModel.modelTypeToName(item.type_)));
+					}
+				} else {
+					Linking.openURL(msg);
+				}
+			} catch (error) {
+				dialogs.error(this, error.message);
+			}
+		}
 	}
 
 	styles() {
@@ -160,7 +194,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 		return shared.isModified(this);
 	}
 
-	async componentWillMount() {
+	async UNSAFE_componentWillMount() {
 		BackButtonService.addHandler(this.backHandler);
 		NavService.addHandler(this.navHandler);
 
@@ -186,8 +220,8 @@ class NoteScreenComponent extends BaseScreenComponent {
 		shared.noteComponent_change(this, 'body', text);
 	}
 
-	async saveNoteButton_press() {
-		await shared.saveNoteButton_press(this);
+	async saveNoteButton_press(folderId = null) {
+		await shared.saveNoteButton_press(this, folderId);
 
 		Keyboard.dismiss();
 	}
@@ -330,10 +364,16 @@ class NoteScreenComponent extends BaseScreenComponent {
 					return;
 				} else {
 					await RNFetchBlob.fs.cp(localFilePath, targetPath);
+					const stat = await shim.fsDriver().stat(targetPath);
+					if (stat.size >= 10000000) {
+						await shim.fsDriver().remove(targetPath);
+						throw new Error('Resources larger than 10 MB are not currently supported as they may crash the mobile applications. The issue is being investigated and will be fixed at a later time.');
+					}
 				}
 			}
 		} catch (error) {
 			reg.logger().warn('Could not attach file:', error);
+			await dialogs.error(this, error.message);
 			return;
 		}
 
@@ -402,6 +442,11 @@ class NoteScreenComponent extends BaseScreenComponent {
 		}
 	}
 
+	copyMarkdownLink_onPress() {
+		const note = this.state.note;
+		Clipboard.setString(Note.markdownTag(note));
+	}
+
 	menuOptions() {
 		const note = this.state.note;
 		const isTodo = note && !!note.is_todo;
@@ -425,6 +470,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 
 		if (isSaved) output.push({ title: _('Tags'), onPress: () => { this.tags_onPress(); } });
 		output.push({ title: isTodo ? _('Convert to note') : _('Convert to todo'), onPress: () => { this.toggleIsTodo_onPress(); } });
+		if (isSaved) output.push({ title: _('Copy Markdown link'), onPress: () => { this.copyMarkdownLink_onPress(); } });
 		output.push({ isDivider: true });
 		if (this.props.showAdvancedOptions) output.push({ title: this.state.showNoteMetadata ? _('Hide metadata') : _('Show metadata'), onPress: () => { this.showMetadata_onPress(); } });
 		output.push({ title: _('View on map'), onPress: () => { this.showOnMap_onPress(); } });
@@ -466,7 +512,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 				this.saveOneProperty('body', newBody);
 			};
 
-			bodyComponent = <NoteBodyViewer style={this.styles().noteBodyViewer} webViewStyle={theme} note={note} onCheckboxChange={(newBody) => { onCheckboxChange(newBody) }}/>
+			bodyComponent = <NoteBodyViewer onJoplinLinkClick={this.onJoplinLinkClick_} style={this.styles().noteBodyViewer} webViewStyle={theme} note={note} onCheckboxChange={(newBody) => { onCheckboxChange(newBody) }}/>
 		} else {
 			const focusBody = !isNew && !!note.title;
 
@@ -481,6 +527,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 					value={note.body}
 					onChangeText={(text) => this.body_changeText(text)}
 					blurOnSubmit={false}
+					selectionColor={theme.textSelectionColor}
 				/>
 			);
 		}
@@ -496,7 +543,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 				},
 			});
 
-			if (this.state.mode == 'edit') return <ActionButton style={{display:'none'}}/>;
+			if (this.state.mode == 'edit') return null;//<ActionButton style={{display:'none'}}/>;
 
 			return <ActionButton multiStates={true} buttons={buttons} buttonIndex={0} />
 		}
@@ -545,6 +592,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 					style={titleTextInputStyle}
 					value={note.title}
 					onChangeText={(text) => this.title_changeText(text)}
+					selectionColor={theme.textSelectionColor}
 				/>
 			</View>
 		);
@@ -558,7 +606,12 @@ class NoteScreenComponent extends BaseScreenComponent {
 						enabled: true,
 						selectedFolderId: folder ? folder.id : null,
 						onValueChange: async (itemValue, itemIndex) => {
-							if (note.id) await Note.moveToFolder(note.id, itemValue);
+							if (!note.id) {
+								await this.saveNoteButton_press(itemValue);
+							} else {
+								await Note.moveToFolder(note.id, itemValue);
+							}
+
 							note.parent_id = itemValue;
 
 							const folder = await Folder.load(note.parent_id);

ReactNativeClient/lib/components/screens/notes.js

@@ -64,7 +64,7 @@ class NotesScreenComponent extends BaseScreenComponent {
 		await this.refreshNotes();
 	}
 
-	async componentWillReceiveProps(newProps) {
+	async UNSAFE_componentWillReceiveProps(newProps) {
 		if (newProps.notesOrder !== this.props.notesOrder ||
 		    newProps.selectedFolderId != this.props.selectedFolderId ||
 		    newProps.selectedTagId != this.props.selectedTagId ||
@@ -107,7 +107,7 @@ class NotesScreenComponent extends BaseScreenComponent {
 	}
 
 	deleteFolder_onPress(folderId) {
-		dialogs.confirm(this, _('Delete notebook? All notes within this notebook will also be deleted.')).then((ok) => {
+		dialogs.confirm(this, _('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.')).then((ok) => {
 			if (!ok) return;
 
 			Folder.delete(folderId).then(() => {

ReactNativeClient/lib/components/screens/onedrive-login.js

@@ -21,7 +21,7 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
 		this.authCode_ = null;
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.setState({
 			webviewUrl: this.startUrl(),
 		});

ReactNativeClient/lib/components/screens/search.js

@@ -70,7 +70,7 @@ class SearchScreenComponent extends BaseScreenComponent {
 		this.isMounted_ = false;
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		let newState = {};
 		if ('query' in newProps) newState.query = newProps.query;
 
@@ -162,6 +162,7 @@ class SearchScreenComponent extends BaseScreenComponent {
 							onSubmitEditing={() => { this.searchTextInput_submit() }}
 							onChangeText={(text) => this.searchTextInput_changeText(text) }
 							value={this.state.query}
+							selectionColor={theme.textSelectionColor}
 						/>
 						<TouchableHighlight onPress={() => this.clearButton_press() }>
 							<Icon name='md-close-circle' style={this.styles().clearIcon} />

ReactNativeClient/lib/components/screens/status.js

@@ -34,7 +34,7 @@ class StatusScreenComponent extends BaseScreenComponent {
 		};
 	}
 
-	componentWillMount() {
+	UNSAFE_componentWillMount() {
 		this.resfreshScreen();
 	}
 

ReactNativeClient/lib/components/screens/tag.js

@@ -25,7 +25,7 @@ class TagScreenComponent extends BaseScreenComponent {
 		this.refreshNotes();
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		if (newProps.selectedTagId !== this.props.selectedTagId) {
 			this.refreshNotes(newProps);
 		}

ReactNativeClient/lib/components/select-date-time-dialog.js

@@ -14,7 +14,7 @@ class SelectDateTimeDialog extends Component {
 		this.state = { date: null };
 	}
 
-	componentWillReceiveProps(newProps) {
+	UNSAFE_componentWillReceiveProps(newProps) {
 		if (newProps.date != this.state.date) {
 			this.setState({ date: newProps.date });
 		}

ReactNativeClient/lib/components/shared/note-screen-shared.js

@@ -10,14 +10,16 @@ shared.noteExists = async function(noteId) {
 	return !!existingNote;
 }
 
-shared.saveNoteButton_press = async function(comp) {
+shared.saveNoteButton_press = async function(comp, folderId = null) {
 	let note = Object.assign({}, comp.state.note);
 
 	// Note has been deleted while user was modifying it. In that case, we
 	// just save a new note by clearing the note ID.
 	if (note.id && !(await shared.noteExists(note.id))) delete note.id;
 
-	if (!note.parent_id) {
+	if (folderId) {
+		note.parent_id = folderId;
+	} else if (!note.parent_id) {
 		let folder = await Folder.defaultFolder();
 		if (!folder) return;
 		note.parent_id = folder.id;

ReactNativeClient/lib/components/shared/reduxSharedMiddleware.js

@@ -0,0 +1,11 @@
+const Setting = require('lib/models/Setting');
+
+const reduxSharedMiddleware = function(store, next, action) {
+	const newState = store.getState();
+
+	if (action.type == 'FOLDER_SET_COLLAPSED' || action.type == 'FOLDER_TOGGLE') {
+		Setting.setValue('collapsedFolderIds', newState.collapsedFolderIds);
+	}
+}
+
+module.exports = reduxSharedMiddleware;

ReactNativeClient/lib/components/shared/side-menu-shared.js

@@ -1,14 +1,48 @@
+const ArrayUtils = require('lib/ArrayUtils');
+const Folder = require('lib/models/Folder');
+const BaseModel = require('lib/BaseModel');
+
 let shared = {};
 
-shared.renderFolders = function(props, renderItem) {
-	let items = [];
-	for (let i = 0; i < props.folders.length; i++) {
-		let folder = props.folders[i];
-		items.push(renderItem(folder, props.selectedFolderId == folder.id && props.notesParentType == 'Folder'));
+function folderHasChildren_(folders, folderId) {
+	for (let i = 0; i < folders.length; i++) {
+		let folder = folders[i];
+		if (folder.parent_id === folderId) return true;
+	}
+	return false;
+}
+
+function folderIsVisible(folders, folderId, collapsedFolderIds) {
+	if (!collapsedFolderIds || !collapsedFolderIds.length) return true;
+
+	while (true) {
+		let folder = BaseModel.byId(folders, folderId);
+		if (!folder) throw new Error('No folder with id ' + folder.id);
+		if (!folder.parent_id) return true;
+		if (collapsedFolderIds.indexOf(folder.parent_id) >= 0) return false;
+		folderId = folder.parent_id;
+	}
+
+	return true;
+}
+
+function renderFoldersRecursive_(props, renderItem, items, parentId, depth) {
+	const folders = props.folders;
+	for (let i = 0; i < folders.length; i++) {
+		let folder = folders[i];
+		if (!Folder.idsEqual(folder.parent_id, parentId)) continue;
+		if (!folderIsVisible(props.folders, folder.id, props.collapsedFolderIds)) continue;
+		const hasChildren = folderHasChildren_(folders, folder.id);
+		items.push(renderItem(folder, props.selectedFolderId == folder.id && props.notesParentType == 'Folder', hasChildren, depth));
+		if (hasChildren) items = renderFoldersRecursive_(props, renderItem, items, folder.id, depth + 1);
 	}
 	return items;
 }
 
+shared.renderFolders = function(props, renderItem) {
+	return renderFoldersRecursive_(props, renderItem, [], '', 0);
+}
+
 shared.renderTags = function(props, renderItem) {
 	let tags = props.tags.slice();
 	tags.sort((a, b) => { return a.title < b.title ? -1 : +1; });

ReactNativeClient/lib/components/side-menu-content.js

@@ -64,11 +64,13 @@ class SideMenuContentComponent extends Component {
 		};
 
 		styles.folderButton = Object.assign({}, styles.button);
+		styles.folderButton.paddingLeft = 0;
 		styles.folderButtonText = Object.assign({}, styles.buttonText);
 		styles.folderButtonSelected = Object.assign({}, styles.folderButton);
 		styles.folderButtonSelected.backgroundColor = theme.selectedColor;
 		styles.folderIcon = Object.assign({}, theme.icon);
-		styles.folderIcon.color = '#0072d5';
+		styles.folderIcon.color = theme.colorFaded;//'#0072d5';
+		styles.folderIcon.paddingTop = 3;
 
 		styles.tagButton = Object.assign({}, styles.button);
 		styles.tagButtonSelected = Object.assign({}, styles.tagButton);
@@ -94,6 +96,13 @@ class SideMenuContentComponent extends Component {
 		});
 	}
 
+	folder_togglePress(folder) {
+		this.props.dispatch({
+			type: 'FOLDER_TOGGLE',
+			id: folder.id,
+		});
+	}
+
 	tag_press(tag) {
 		this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
 
@@ -109,17 +118,41 @@ class SideMenuContentComponent extends Component {
 		if (actionDone === 'auth') this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
 	}
 
-	folderItem(folder, selected) {
-		const iconComp = selected ? <Icon name='md-folder-open' style={this.styles().folderIcon} /> : <Icon name='md-folder' style={this.styles().folderIcon} />;
-		const folderButtonStyle = selected ? this.styles().folderButtonSelected : this.styles().folderButton;
+	folderItem(folder, selected, hasChildren, depth) {
+		const theme = themeStyle(this.props.theme);
+
+		const folderButtonStyle = {
+			flex: 1,
+			flexDirection: 'row',
+			height: 36,
+			alignItems: 'center',
+			paddingLeft: theme.marginLeft,
+			paddingRight: theme.marginRight,
+		};
+		if (selected) folderButtonStyle.backgroundColor = theme.selectedColor;
+		folderButtonStyle.paddingLeft = depth * 10;
+
+		const iconWrapperStyle = { paddingLeft: 10, paddingRight: 10 };
+		if (selected) iconWrapperStyle.backgroundColor = theme.selectedColor;
+
+		const iconName = this.props.collapsedFolderIds.indexOf(folder.id) >= 0 ? 'md-arrow-dropdown' : 'md-arrow-dropup';
+		const iconComp = <Icon name={iconName} style={this.styles().folderIcon} />
+
+		const iconWrapper = !hasChildren ? null : (
+			<TouchableOpacity style={iconWrapperStyle} folderid={folder.id} onPress={() => { if (hasChildren) this.folder_togglePress(folder) }}>
+				{ iconComp }
+			</TouchableOpacity>
+		);
 
 		return (
-			<TouchableOpacity key={folder.id} onPress={() => { this.folder_press(folder) }}>
-				<View style={folderButtonStyle}>
-					{ iconComp }
-					<Text numberOfLines={1} style={this.styles().folderButtonText}>{Folder.displayTitle(folder)}</Text>
-				</View>
-			</TouchableOpacity>
+			<View key={folder.id} style={{ flex: 1, flexDirection: 'row' }}>
+				<TouchableOpacity style={{ flex: 1 }} onPress={() => { this.folder_press(folder) }}>
+					<View style={folderButtonStyle}>
+						<Text numberOfLines={1} style={this.styles().folderButtonText}>{Folder.displayTitle(folder)}</Text>
+					</View>
+				</TouchableOpacity>
+				{ iconWrapper }
+			</View>
 		);
 	}
 
@@ -204,9 +237,6 @@ class SideMenuContentComponent extends Component {
 		return (
 			<View style={style}>
 				<View style={{flex:1, opacity: this.props.opacity}}>
-					<View style={{flexDirection:'row'}}>
-						<Image style={{flex:1, height: 100}} source={require('../images/SideMenuHeader.png')} />
-					</View>
 					<ScrollView scrollsToTop={false} style={this.styles().menu}>
 						{ items }
 					</ScrollView>
@@ -229,6 +259,7 @@ const SideMenuContent = connect(
 			locale: state.settings.locale,
 			theme: state.settings.theme,
 			opacity: state.sideMenuOpenPercent,
+			collapsedFolderIds: state.collapsedFolderIds,
 		};
 	}
 )(SideMenuContentComponent)

ReactNativeClient/lib/file-api-driver-webdav.js

@@ -38,7 +38,7 @@ class FileApiDriverWebDav {
 	}
 
 	statFromResource_(resource, path) {
-		// WebDAV implementations are always slighly different from one server to another but, at the minimum,
+		// WebDAV implementations are always slightly different from one server to another but, at the minimum,
 		// a resource should have a propstat key - if not it's probably an error.
 		const propStat = this.api().arrayFromJson(resource, ['d:propstat']);
 		if (!Array.isArray(propStat)) throw new Error('Invalid WebDAV resource format: ' + JSON.stringify(resource));

ReactNativeClient/lib/joplin-database.js

@@ -202,14 +202,14 @@ class JoplinDatabase extends Database {
 		// default value and thus might cause problems. In that case, the default value
 		// must be set in the synchronizer too.
 
-		const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+		const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 
 		let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion);
 
-		if (currentVersionIndex < 0) throw new Error('Unknown profile version. Most likely this is an old version of Joplin, while the profile was created by a newer version. Please upgrade Joplin at https://joplin.cozic.net and try again.');
-
 		// currentVersionIndex < 0 if for the case where an old version of Joplin used with a newer
 		// version of the database, so that migration is not run in this case.
+		if (currentVersionIndex < 0) throw new Error('Unknown profile version. Most likely this is an old version of Joplin, while the profile was created by a newer version. Please upgrade Joplin at https://joplin.cozic.net and try again.');
+
 		if (currentVersionIndex == existingDatabaseVersions.length - 1) return false;
 
 		while (currentVersionIndex < existingDatabaseVersions.length - 1) {
@@ -344,6 +344,10 @@ class JoplinDatabase extends Database {
 				upgradeVersion10();
 			}
 
+			if (targetVersion == 12) {
+				queries.push('ALTER TABLE folders ADD COLUMN parent_id TEXT NOT NULL DEFAULT ""');
+			}
+
 			queries.push({ sql: 'UPDATE version SET version = ?', params: [targetVersion] });
 			await this.transactionExecBatch(queries);
 

ReactNativeClient/lib/layout-utils.js

@@ -1,9 +1,9 @@
 const layoutUtils = {};
 
-layoutUtils.size = function(prefered, min, max) {
-	if (prefered < min) return min;
-	if (typeof max !== 'undefined' && prefered > max) return max;
-	return prefered;
+layoutUtils.size = function(preferred, min, max) {
+	if (preferred < min) return min;
+	if (typeof max !== 'undefined' && preferred > max) return max;
+	return preferred;
 }
 
 module.exports = layoutUtils;

ReactNativeClient/lib/models/BaseItem.js

@@ -6,6 +6,7 @@ const { time } = require('lib/time-utils.js');
 const { sprintf } = require('sprintf-js');
 const { _ } = require('lib/locale.js');
 const moment = require('moment');
+const { markdownUtils } = require('lib/markdown-utils.js');
 
 class BaseItem extends BaseModel {
 
@@ -649,6 +650,15 @@ class BaseItem extends BaseModel {
 		return super.save(o, options);
 	}
 
+	static markdownTag(item) {
+		const output = [];
+		output.push('[');
+		output.push(markdownUtils.escapeLinkText(item.title));
+		output.push(']');
+		output.push('(:/' + item.id + ')');
+		return output.join('');
+	}
+
 }
 
 BaseItem.encryptionService_ = null;

ReactNativeClient/lib/models/Folder.js

@@ -18,7 +18,7 @@ class Folder extends BaseItem {
 	static async serialize(folder) {
 		let fieldNames = this.fieldNames();
 		fieldNames.push('type_');
-		lodash.pull(fieldNames, 'parent_id');
+		//lodash.pull(fieldNames, 'parent_id');
 		return super.serialize(folder, 'folder', fieldNames);
 	}
 
@@ -57,6 +57,11 @@ class Folder extends BaseItem {
 		});
 	}
 
+	static async subFolderIds(parentId) {
+		const rows = await this.db().selectAll('SELECT id FROM folders WHERE parent_id = ?', [parentId]);
+		return rows.map(r => r.id);
+	}
+
 	static async noteCount(parentId) {
 		let r = await this.db().selectOne('SELECT count(*) as total FROM notes WHERE is_conflict = 0 AND parent_id = ?', [parentId]);
 		return r ? r.total : 0;
@@ -79,6 +84,11 @@ class Folder extends BaseItem {
 			for (let i = 0; i < noteIds.length; i++) {
 				await Note.delete(noteIds[i]);
 			}
+
+			let subFolderIds = await Folder.subFolderIds(folderId);
+			for (let i = 0; i < subFolderIds.length; i++) {
+				await Folder.delete(subFolderIds[i]);
+			}
 		}
 
 		await super.delete(folderId, options);
@@ -101,6 +111,7 @@ class Folder extends BaseItem {
 		return {
 			type_: this.TYPE_FOLDER,
 			id: this.conflictFolderId(),
+			parent_id: '',
 			title: this.conflictFolderTitle(),
 			updated_time: time.unixMs(),
 			user_updated_time: time.unixMs(),
@@ -125,6 +136,39 @@ class Folder extends BaseItem {
 		return this.modelSelectOne('SELECT * FROM folders ORDER BY created_time DESC LIMIT 1');
 	}
 
+	static async canNestUnder(folderId, targetFolderId) {
+		if (folderId === targetFolderId) return false;
+
+		const conflictFolderId = Folder.conflictFolderId();
+		if (folderId == conflictFolderId || targetFolderId == conflictFolderId) return false;
+
+		if (!targetFolderId) return true;
+
+		while (true) {
+			let folder = await Folder.load(targetFolderId);
+			if (!folder.parent_id) break;
+			if (folder.parent_id === folderId) return false;
+			targetFolderId = folder.parent_id;
+		}
+
+		return true;
+	}
+
+	static async moveToFolder(folderId, targetFolderId) {
+		if (!(await this.canNestUnder(folderId, targetFolderId))) throw new Error(_('Cannot move notebook to this location'));
+
+		// When moving a note to a different folder, the user timestamp is not updated.
+		// However updated_time is updated so that the note can be synced later on.
+
+		const modifiedFolder = {
+			id: folderId,
+			parent_id: targetFolderId,
+			updated_time: time.unixMs(),
+		};
+
+		return Folder.save(modifiedFolder, { autoTimestamp: false });
+	}
+
 	// These "duplicateCheck" and "reservedTitleCheck" should only be done when a user is
 	// manually creating a folder. They shouldn't be done for example when the folders
 	// are being synced to avoid any strange side-effects. Technically it's possible to 

ReactNativeClient/lib/models/Note.js

@@ -107,7 +107,7 @@ class Note extends BaseItem {
 		return BaseModel.TYPE_NOTE;
 	}
 
-	static linkedResourceIds(body) {
+	static linkedItemIds(body) {
 		// For example: ![](:/fcca2938a96a22570e8eae2565bc6b0b)
 		if (!body || body.length <= 32) return [];
 		const matches = body.match(/\(:\/.{32}\)/g);
@@ -115,6 +115,35 @@ class Note extends BaseItem {
 		return matches.map((m) => m.substr(3, 32));
 	}
 
+	static async linkedItems(body) {
+		const itemIds = this.linkedItemIds(body);
+		const output = [];
+
+		for (let i = 0; i < itemIds.length; i++) {
+			const item = await BaseItem.loadItemById(itemIds[i]);
+			if (!item) continue;
+			output.push(item);
+		}
+
+		return output;
+	}
+
+	static async linkedItemIdsByType(type, body) {
+		const items = await this.linkedItems(body);
+		const output = [];
+
+		for (let i = 0; i < items.length; i++) {
+			const item = items[i];
+			if (item.type_ === type) output.push(item.id);
+		}
+
+		return output;
+	}
+
+	static async linkedResourceIds(body) {
+		return await this.linkedItemIdsByType(BaseModel.TYPE_RESOURCE, body);
+	}
+
 	static new(parentId = '') {
 		let output = super.new();
 		output.parent_id = parentId;