self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Merge branch 'master' into search_engine_fts_fix

Browse Source
This commit is contained in:
Laurent Cozic 2019-01-15 19:33:42 +00:00
commit 384ca09842
33 changed files with 121 additions and 2295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CliClient/locales/de_DE.po
View File

@ -663,9 +663,8 @@ msgstr "Im externen Editor bearbeiten"
msgid "Search in all the notes"
msgstr "Alle Notizen durchsuchen"
#, fuzzy
msgid "Search in current note"
msgstr "Alle Notizen durchsuchen"
msgstr "Aktuelle Notiz durchsuchen"
msgid "View"
msgstr "Ansicht"
@ -1023,7 +1022,7 @@ msgid "Copy Link Address"
msgstr "Link-Adresse kopieren"
msgid "This attachment is not downloaded or not decrypted yet."
msgstr ""
msgstr "Dieser Anhang wurde nicht heruntergeladen oder noch nicht entschlüsselt."
#, javascript-format
msgid "Unsupported link or message: %s"
@ -1142,9 +1141,9 @@ msgstr "Notizbücher"
msgid "Decrypting items: %d/%d"
msgstr "Entschlüsselte Objekte: %d/%d"
#, fuzzy, javascript-format
#, javascript-format
msgid "Fetching resources: %d"
msgstr "Anhänge: %d."
msgstr "Ressourcen abrufen: %d"
msgid "Please select where the sync status should be exported to"
msgstr ""
@ -1355,6 +1354,9 @@ msgid ""
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr ""
"Dadurch kann Joplin im Hintergrund laufen. Es wird empfohlen,"
"diese Einstellung zu aktivieren, damit deine Notizen ständig synchronisiert"
"werden und somit die Anzahl der Konflikte reduziert wird."
msgid "Start application minimised in the tray icon"
msgstr "Starte die Anwendung minimiert im Tray"
@ -1362,12 +1364,11 @@ msgstr "Starte die Anwendung minimiert im Tray"
msgid "Global zoom percentage"
msgstr "Zoomstufe der Benutzeroberfläche"
#, fuzzy
msgid "Editor font size"
msgstr "Editor Schriftenfamilie"
msgstr "Schriftgröße im Editor"
msgid "Editor font family"
msgstr "Editor Schriftenfamilie"
msgstr "Schriftfamilie im Editor"
msgid ""
"This must be *monospace* font or it will not work properly. If the font is "
@ -1496,9 +1497,8 @@ msgstr "Joplin Export Verzeichnis"
msgid "Evernote Export File"
msgstr "Evernote Export Datei"
#, fuzzy
msgid "Json Export Directory"
msgstr "Joplin Export Verzeichnis"
msgstr "Json Export Verzeichnis"
msgid "Directory"
msgstr "Verzeichnis"
@ -1692,24 +1692,24 @@ msgstr ""
msgid "Joplin website"
msgstr "Website von Joplin"
#, fuzzy, javascript-format
#, javascript-format
msgid "Joplin v%s"
msgstr "Website von Joplin"
msgstr "Joplin v%s"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "Datenbank v%s"
#, fuzzy, javascript-format
#, javascript-format
msgid "FTS enabled: %d"
msgstr "Zu löschen: %d"
msgstr "FTS aktiviert: %d"
msgid "Login with Dropbox"
msgstr "Mit Dropbox anmelden"
#, fuzzy
msgid "Enter code here"
msgstr "Zum Terminal-Modus wechseln"
msgstr "Hier Code eingeben"
#, javascript-format
msgid "Master Key %s"
@ -1763,9 +1763,8 @@ msgstr ""
msgid "Unsupported image type: %s"
msgstr "Nicht unterstütztes Fotoformat: %s"
#, fuzzy
msgid "Take photo"
msgstr "Foto anhängen"
msgstr "Foto aufnehmen"
msgid "Attach photo"
msgstr "Foto anhängen"

68
CliClient/locales/it_IT.po
View File

@ -13,8 +13,10 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.1.1\n"
"X-Generator: Poedit 2.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
msgid "To delete a tag, untag the associated notes."
msgstr "Per cancellare un'etichetta, togli l'etichetta associata alle note."
@ -462,7 +464,7 @@ msgid "Starting synchronisation..."
msgstr "Inizio sincronizzazione..."
msgid "Downloading resources..."
msgstr ""
msgstr "Scaricamento risorse…"
msgid "Cancelling... Please wait."
msgstr "Cancellazione... Attendere per favore."
@ -566,6 +568,13 @@ msgid ""
"\n"
"For example, to create a notebook press `mb`; to create a note press `mn`."
msgstr ""
"Benvenuto in Joplin!\n"
"\n"
"Digita `:help shortcuts` per la lista delle scorciatoie da tastiera, oppure "
"solo `:help` per le informazioni di utilizzo.\n"
"\n"
"Per esempio, per creare un taccuino digita `mb`; per creare una nota digita "
"`mn`."
msgid ""
"One or more items are currently encrypted and you may need to supply a "
@ -629,9 +638,8 @@ msgstr "Taglia"
msgid "Paste"
msgstr "Incolla"
#, fuzzy
msgid "Select all"
msgstr "Seleziona la data"
msgstr "Seleziona tutto"
msgid "Bold"
msgstr "Grasseto"
@ -648,9 +656,8 @@ msgstr "Modifica in un editor esterno"
msgid "Search in all the notes"
msgstr "Cerca in tutte le note"
#, fuzzy
msgid "Search in current note"
msgstr "Cerca in tutte le note"
msgstr "Cerca nella nota corrente"
msgid "View"
msgstr "Vista"
@ -952,13 +959,11 @@ msgstr "%s - Copia"
msgid "Switch between note and to-do type"
msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
#, fuzzy
msgid "Switch to note type"
msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
msgstr "Converti in nota"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
msgstr "Converti in \"Cose-da-fare\""
msgid "Copy Markdown link"
msgstr "Copia il link Markdown"
@ -1004,7 +1009,7 @@ msgid "Copy Link Address"
msgstr "Copia l'indirizzo del link"
msgid "This attachment is not downloaded or not decrypted yet."
msgstr ""
msgstr "Questo allegato non è ancora stato scaricato o decriptato."
#, javascript-format
msgid "Unsupported link or message: %s"
@ -1316,10 +1321,10 @@ msgid "When creating a new to-do:"
msgstr "Quando crei un nuovo \"Cose-da-fare\":"
msgid "Focus title"
msgstr ""
msgstr "Focus sul titolo"
msgid "Focus body"
msgstr ""
msgstr "Focus sul testo"
msgid "When creating a new note:"
msgstr "Quando si crea una nuova nota:"
@ -1335,6 +1340,9 @@ msgid ""
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr ""
"Questo consentirà Joplin di essere in esecuzione in background. E’ "
"raccomandata l’attivazione di questa impostazione per sincronizzare "
"costantemente le tue note e quindi ridurre il numero di conflitti."
msgid "Start application minimised in the tray icon"
msgstr ""
@ -1342,12 +1350,11 @@ msgstr ""
msgid "Global zoom percentage"
msgstr "Percentuale di zoom globale"
#, fuzzy
msgid "Editor font size"
msgstr "Editor Famiglia Caratteri"
msgstr "Editor dimensione caratteri"
msgid "Editor font family"
msgstr "Editor Famiglia Caratteri"
msgstr "Editor famiglia caratteri"
msgid ""
"This must be *monospace* font or it will not work properly. If the font is "
@ -1454,14 +1461,14 @@ msgstr "Ignora gli errori del certificato TLS"
#, javascript-format
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Oprione non valida: \"%s\". I valori possibili sono: %s."
msgstr "Opzione non valida: \"%s\". I valori possibili sono: %s."
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
msgstr ""
msgstr "Il tag \"%s\" esiste già. Scegliere un nome differente."
msgid "Joplin Export File"
msgstr "Esposta files di Joplin"
msgstr "Esporta file di Joplin"
msgid "Markdown"
msgstr "Markdown"
@ -1472,9 +1479,8 @@ msgstr "Cartella di esportazione di Joplin"
msgid "Evernote Export File"
msgstr "Esporta files di Evernote"
#, fuzzy
msgid "Json Export Directory"
msgstr "Cartella di esportazione di Joplin"
msgstr "Cartella di esportazione JSON"
msgid "Directory"
msgstr "Cartella"
@ -1551,7 +1557,7 @@ msgid "On %s: %s"
msgstr "Su %s: %s"
msgid "Permission to use camera"
msgstr ""
msgstr "Permesso di usare la fotocamera"
msgid "Your permission to use your camera is required."
msgstr ""
@ -1661,26 +1667,25 @@ msgstr ""
"geografica ad una nota."
msgid "Joplin website"
msgstr "Siro web Joplin"
msgstr "Sito web Joplin"
#, fuzzy, javascript-format
#, javascript-format
msgid "Joplin v%s"
msgstr "Siro web Joplin"
msgstr "Joplin v%s"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "Database v%s"
#, fuzzy, javascript-format
#, javascript-format
msgid "FTS enabled: %d"
msgstr "Da cancellare: %d"
msgstr "FTS attivato: %d"
msgid "Login with Dropbox"
msgstr "Login Dropbox"
#, fuzzy
msgid "Enter code here"
msgstr "Accedi alla modalità linea di comando"
msgstr "Inserisci qui il codice"
#, javascript-format
msgid "Master Key %s"
@ -1734,9 +1739,8 @@ msgstr ""
msgid "Unsupported image type: %s"
msgstr "Tipo di immagine non supportata: %s"
#, fuzzy
msgid "Take photo"
msgstr "Allega foto"
msgstr "Scatta foto"
msgid "Attach photo"
msgstr "Allega foto"

8
CliClient/locales/nb_NO.po
View File

@ -1656,21 +1656,21 @@ msgstr "Joplins nettsted"
#, fuzzy, javascript-format
msgid "Joplin v%s"
msgstr "Joplins nettsted"
msgstr "Joplin v%s"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "Database v%s"
#, fuzzy, javascript-format
msgid "FTS enabled: %d"
msgstr "Slettes: %d"
msgstr "Fulltekstsøk aktivert: %d"
msgid "Login with Dropbox"
msgstr "Innlogging med Dropbox"
msgid "Enter code here"
msgstr ""
msgstr "Skriv inn kode her"
#, javascript-format
msgid "Master Key %s"

3
CliClient/package.json
View File

@ -15,7 +15,8 @@
"years": [
2016,
2017,
2018
2018,
2019
],
"owner": "Laurent Cozic"
},

1
CliClientDemo/.gitignore vendored
View File

@ -1 +0,0 @@
node_modules

BIN
CliClientDemo/database.sqlite
View File

Binary file not shown.

31
CliClientDemo/index.js
View File

@ -1,31 +0,0 @@
#!/usr/bin/env node
'use strict';
const spawn = require('child_process').spawn;
const os = require('os');
const fs = require('fs-extra');
const joplinPath = __dirname + '/node_modules/.bin/joplin';
const profileDir = os.homedir() + '/.config/demo-joplin';
const dbFilename = 'database.sqlite';
fs.ensureDirSync(profileDir);
if (!fs.pathExistsSync(profileDir + '/' + dbFilename)) {
fs.copySync(__dirname + '/' + dbFilename, profileDir + '/' + dbFilename);
}
const opt = {
cwd: __dirname,
env: (function() {
process.env.NODE_PATH = '.';
return process.env;
}()),
stdio: [process.stdin, process.stdout, process.stderr]
};
const app = spawn(joplinPath, ['--is-demo', '--profile', profileDir], opt);
app.on('close', (code) => {
process.exit(code);
});

2124
CliClientDemo/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

33
CliClientDemo/package.json
View File

@ -1,33 +0,0 @@
{
"name": "demo-joplin",
"version": "1.0.8",
"description": "Demo for Joplin CLI",
"bin": {
"demo-joplin": "./index.js"
},
"bugs": {
"url": "https://github.com/laurent22/joplin/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/laurent22/joplin"
},
"engines": {
"node": ">=8.7.0"
},
"copyright": {
"title": "Demo for Joplin CLI",
"years": [
2016,
2017,
2018
],
"owner": "Laurent Cozic"
},
"dependencies": {
"fs-extra": "^4.0.2",
"joplin": "^0.10.69"
},
"author": "Laurent Cozic",
"license": "MIT"
}

5
CliClientDemo/publish.sh
View File

@ -1,5 +0,0 @@
#!/bin/bash
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
npm version patch
npm publish

2
ElectronClient/app/app.js
View File

@ -602,7 +602,7 @@ class Application extends BaseApplication {
let message = [
p.description,
'',
'Copyright © 2016-2018 Laurent Cozic',
'Copyright © 2016-2019 Laurent Cozic',
_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
];
bridge().showInfoMessageBox(message.join('\n'), {

3
ElectronClient/app/checkForUpdates.js
View File

@ -123,10 +123,11 @@ function checkForUpdates(inBackground, window, logFilePath, options) {
if (!checkInBackground_) dialog.showMessageBox({ message: _('Current version is up-to-date.') })
} else {
const releaseNotes = release.notes.trim() ? "\n\n" + release.notes.trim() : '';
const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;
const buttonIndex = dialog.showMessageBox(parentWindow_, {
type: 'info',
message: _('An update is available, do you want to download it now?' + releaseNotes),
message: _('An update is available, do you want to download it now?') + '\n\n' + _('Your version: v%s', packageInfo.version) + '\n' + _('New version: v%s', newVersionString) + releaseNotes,
buttons: [_('Yes'), _('No')]
});

8
ElectronClient/app/gui/NoteText.jsx
View File

@ -6,7 +6,7 @@ const Search = require('lib/models/Search.js');
const { time } = require('lib/time-utils.js');
const Setting = require('lib/models/Setting.js');
const { IconButton } = require('./IconButton.min.js');
const { urlDecode, escapeHtml } = require('lib/string-utils');
const { urlDecode, escapeHtml, pregQuote } = require('lib/string-utils');
const Toolbar = require('./Toolbar.min.js');
const TagList = require('./TagList.min.js');
const { connect } = require('react-redux');
@ -1588,7 +1588,11 @@ class NoteTextComponent extends React.Component {
const markerOptions = {};
if (this.state.showLocalSearch) {
keywords = [this.state.localSearch.query];
keywords = [{
type: 'text',
value: this.state.localSearch.query,
accuracy: 'partially',
}]
markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
} else {
const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);

39
ElectronClient/app/gui/note-viewer/index.html
View File

@ -263,15 +263,22 @@
for (let i = 0; i < keywords.length; i++) {
const keyword = keywords[i];
if (typeof keyword === 'string') {
keyword = {
type: 'text',
value: keyword,
};
}
if (keyword.type === 'regex') {
mark_.markRegExp(new RegExp('\\b' + keyword.value + '\\b', 'gmi'), {
each: onEachElement,
acrossElements: true,
});
} else {
mark_.mark([keyword], {
mark_.mark([keyword.value], {
each: onEachElement,
accuracy: 'exactly',
accuracy: keyword.accuracy ? keyword.accuracy : 'exactly',
});
}
}
@ -365,22 +372,38 @@
return false;
}
function getParentAnchorElement(element) {
let counter = 0;
while (true) {
if (counter++ >= 10000) {
console.warn('been looping for too long - exiting')
return null;
}
if (!element) return null;
if (element.nodeName === 'A') return element;
element = element.parentElement;
}
}
document.addEventListener('click', function(event) {
const t = event.target;
const anchor = getParentAnchorElement(event.target);
if (!anchor) return;
// Prevent URLs added via <a> tags from being opened within the application itself
// otherwise it would open the whole website within the WebView.
if (t && t.nodeName === 'A' && !t.hasAttribute('data-from-md')) {
if (handleInternalLink(event, t)) return;
if (!anchor.hasAttribute('data-from-md')) {
if (handleInternalLink(event, anchor)) return;
event.preventDefault();
ipcProxySendToHost(t.getAttribute('href'));
ipcProxySendToHost(anchor.getAttribute('href'));
return;
}
// If this is an internal link, jump to the anchor directly
if (t && t.nodeName === 'A' && t.hasAttribute('data-from-md')) {
if (handleInternalLink(event, t)) return;
if (anchor.hasAttribute('data-from-md')) {
if (handleInternalLink(event, anchor)) return;
}
});

2
LICENSE
View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
README.md
View File

@ -370,7 +370,7 @@ Current translations:
MIT License
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

4
ReactNativeClient/ios/Joplin/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>10.0.27</string>
<string>10.0.28</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>27</string>
<string>28</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

2
Tools/PortableAppsLauncher/Other/Source/License.txt
View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
Tools/build-website.js
View File

@ -229,7 +229,7 @@ const headerHtml = `<!doctype html>
const footerHtml = `
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/api/index.html
View File

@ -735,7 +735,7 @@ for (let portToTest = 41184; portToTest &lt;= 41194; portToTest++) {
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/changelog/index.html
View File

@ -831,7 +831,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/clipper/index.html
View File

@ -315,7 +315,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/debugging/index.html
View File

@ -324,7 +324,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/desktop/index.html
View File

@ -284,7 +284,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/donate/index.html
View File

@ -303,7 +303,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/e2ee/index.html
View File

@ -302,7 +302,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/faq/index.html
View File

@ -345,7 +345,7 @@ on this server.&lt;/p&gt;
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

4
docs/index.html
View File

@ -723,7 +723,7 @@ $$
</ul>
<h1 id="license">License</h1>
<p>MIT License</p>
<p>Copyright (c) 2016-2018 Laurent Cozic</p>
<p>Copyright (c) 2016-2019 Laurent Cozic</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
@ -759,7 +759,7 @@ $$
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/mobile/index.html
View File

@ -283,7 +283,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/spec/index.html
View File

@ -371,7 +371,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

2
docs/stats/index.html
View File

@ -875,7 +875,7 @@
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

8
docs/terminal/index.html
View File

@ -278,10 +278,6 @@
</tbody>
</table>
<p>To start it, type <code>joplin</code>.</p>
<h1 id="demo">Demo</h1>
<p>The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example to-do list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application.</p>
<pre><code>npm install -g demo-joplin
</code></pre><p>To start it, type <code>demo-joplin</code>.</p>
<h1 id="usage">Usage</h1>
<p>To start the application type <code>joplin</code>. This will open the user interface, which has three main panes: Notebooks, Notes and the text of the current note. There are also additional panels that can be toggled on and off via <a href="#shortcuts">shortcuts</a>.</p>
<p><img src="https://joplin.cozic.net/images/ScreenshotTerminalCaptions.png" height="450px"></p>
@ -796,7 +792,7 @@ version
Displays version information
</code></pre><h1 id="license">License</h1>
<p>Copyright (c) 2016-2018 Laurent Cozic</p>
<p>Copyright (c) 2016-2019 Laurent Cozic</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
@ -832,7 +828,7 @@ version
</script>
<div class="footer">
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
</div>
</body>
</html>

10
readme/terminal.md
View File

@ -18,14 +18,6 @@ Arch Linux | An Arch Linux package is available [here](https://aur.archlinux.org
To start it, type `joplin`.
# Demo
The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example to-do list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application.
npm install -g demo-joplin
To start it, type `demo-joplin`.
# Usage
To start the application type `joplin`. This will open the user interface, which has three main panes: Notebooks, Notes and the text of the current note. There are also additional panels that can be toggled on and off via [shortcuts](#shortcuts).
@ -522,7 +514,7 @@ The following commands are available in [command-line mode](#command-line-mode):
# License
Copyright (c) 2016-2018 Laurent Cozic
Copyright (c) 2016-2019 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: