Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing website

pull/41/head v0.10.65
Laurent Cozic 2017-11-01 17:39:56 +00:00
parent 61a74bc7e0
commit 8b454e1e95
7 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CliClient/app/build-website.js
View File

@ -128,7 +128,6 @@ const headerHtml = `
`; `;
const footerHtml = ` const footerHtml = `
<hr/>Copyright (c) 2016-2017 Laurent Cozic
</body> </body>
</html> </html>
`; `;

2
CliClient/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "joplin", "name": "joplin",
"version": "0.10.64", "version": "0.10.65",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
CliClient/package.json
View File

@ -18,7 +18,7 @@
], ],
"owner": "Laurent Cozic" "owner": "Laurent Cozic"
}, },
"version": "0.10.64", "version": "0.10.65",
"bin": { "bin": {
"joplin": "./main.js" "joplin": "./main.js"
}, },

2
README.md
View File

@ -134,6 +134,8 @@ To initiate the synchronisation process, type `:sync`. You will be asked to foll
An Android client is available and can synchronise with the terminal client via OneDrive: An Android client is available and can synchronise with the terminal client via OneDrive:
<img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/Phone.png">
<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="60px" src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a> <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="60px" src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
# URLs # URLs

5
ReactNativeClient/lib/components/screens/note.js
View File

@ -293,7 +293,10 @@ class NoteScreenComponent extends BaseScreenComponent {
async attachFile_onPress() { async attachFile_onPress() {
const res = await this.pickDocument(); const res = await this.pickDocument();
if (!res) return; if (!res) {
reg.logger().info('Did not get any file (user cancel?)');
return;
}
const localFilePath = res.uri; const localFilePath = res.uri;

BIN
docs/images/Phone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

2
index.html
View File

@ -236,6 +236,7 @@
<pre><code>*/30 * * * * /path/to/joplin sync <pre><code>*/30 * * * * /path/to/joplin sync
</code></pre><h1 id="android-client">Android client</h1> </code></pre><h1 id="android-client">Android client</h1>
<p>An Android client is available and can synchronise with the terminal client via OneDrive:</p> <p>An Android client is available and can synchronise with the terminal client via OneDrive:</p>
<p><img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/Phone.png"></p>
<p><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="60px" src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a></p> <p><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="60px" src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a></p>
<h1 id="urls">URLs</h1> <h1 id="urls">URLs</h1>
<p>When Ctrl+Clicking a URL, most terminals will open that URL in the default browser. However, one issue, especially with long URLs, is that they can end up like this:</p> <p>When Ctrl+Clicking a URL, most terminals will open that URL in the default browser. However, one issue, especially with long URLs, is that they can end up like this:</p>
@ -458,6 +459,5 @@ version
</script> </script>
<hr/>Copyright (c) 2016-2017 Laurent Cozic
</body> </body>
</html> </html>