diff --git a/CliClient/app/build-doc.js b/CliClient/app/build-doc.js index f9da733b21..e7e0f55d71 100644 --- a/CliClient/app/build-doc.js +++ b/CliClient/app/build-doc.js @@ -102,7 +102,7 @@ function getFooter() { output.push('WEBSITE'); output.push(''); - output.push(INDENT + 'http://joplin.cozic.net'); + output.push(INDENT + 'https://joplin.cozic.net'); output.push(''); diff --git a/CliClient/app/command-help.js b/CliClient/app/command-help.js index d743b08bc1..1babe43b0b 100644 --- a/CliClient/app/command-help.js +++ b/CliClient/app/command-help.js @@ -37,7 +37,7 @@ class Command extends BaseCommand { const stdoutWidth = app().commandStdoutMaxWidth(); if (args.command === 'shortcuts' || args.command === 'keymap') { - this.stdout(_('For information on how to customise the shortcuts please visit %s', 'http://joplin.cozic.net/terminal/#shortcuts')); + this.stdout(_('For information on how to customise the shortcuts please visit %s', 'https://joplin.cozic.net/terminal/#shortcuts')); this.stdout(''); if (app().gui().isDummy()) { diff --git a/ElectronClient/app/app.js b/ElectronClient/app/app.js index 7a0c0cdae0..14633afda2 100644 --- a/ElectronClient/app/app.js +++ b/ElectronClient/app/app.js @@ -448,10 +448,10 @@ class Application extends BaseApplication { submenu: [{ label: _('Website and documentation'), accelerator: 'F1', - click () { bridge().openExternal('http://joplin.cozic.net') } + click () { bridge().openExternal('https://joplin.cozic.net') } }, { label: _('Make a donation'), - click () { bridge().openExternal('http://joplin.cozic.net/donate') } + click () { bridge().openExternal('https://joplin.cozic.net/donate') } }, { label: _('Check for updates...'), click: () => { diff --git a/ElectronClient/app/gui/EncryptionConfigScreen.jsx b/ElectronClient/app/gui/EncryptionConfigScreen.jsx index 3a5117f8b5..9a76e3cc48 100644 --- a/ElectronClient/app/gui/EncryptionConfigScreen.jsx +++ b/ElectronClient/app/gui/EncryptionConfigScreen.jsx @@ -190,7 +190,7 @@ class EncryptionConfigScreenComponent extends React.Component { If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup {pathUtils.toSystemSlashes(Setting.value('profileDir'), process.platform)}

- For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation: {bridge().openExternal('http://joplin.cozic.net/help/e2ee.html')}} href="#">http://joplin.cozic.net/help/e2ee.html + For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation: {bridge().openExternal('https://joplin.cozic.net/help/e2ee.html')}} href="#">https://joplin.cozic.net/help/e2ee.html

*/}

{_('Status')}

diff --git a/ReactNativeClient/lib/components/screens/config.js b/ReactNativeClient/lib/components/screens/config.js index 4ea8b5ea54..004f5345e9 100644 --- a/ReactNativeClient/lib/components/screens/config.js +++ b/ReactNativeClient/lib/components/screens/config.js @@ -203,7 +203,7 @@ class ConfigScreenComponent extends BaseScreenComponent { settingComps.push( - { Linking.openURL('http://joplin.cozic.net/donate/') }}> + { Linking.openURL('https://joplin.cozic.net/donate/') }}> {_('Make a donation')} @@ -211,7 +211,7 @@ class ConfigScreenComponent extends BaseScreenComponent { settingComps.push( - { Linking.openURL('http://joplin.cozic.net/') }}> + { Linking.openURL('https://joplin.cozic.net/') }}> {_('Joplin website')} @@ -219,7 +219,7 @@ class ConfigScreenComponent extends BaseScreenComponent { settingComps.push( - { Linking.openURL('http://joplin.cozic.net/privacy/') }}> + { Linking.openURL('https://joplin.cozic.net/privacy/') }}> Privacy Policy diff --git a/ReactNativeClient/lib/components/screens/encryption-config.js b/ReactNativeClient/lib/components/screens/encryption-config.js index cfd51da210..f1949fa262 100644 --- a/ReactNativeClient/lib/components/screens/encryption-config.js +++ b/ReactNativeClient/lib/components/screens/encryption-config.js @@ -226,7 +226,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent { Important: This is a *beta* feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain. If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup your notes from the desktop or terminal application. For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation: - { Linking.openURL('http://joplin.cozic.net/help/e2ee.html') }}>http://joplin.cozic.net/help/e2ee.html + { Linking.openURL('https://joplin.cozic.net/help/e2ee.html') }}>https://joplin.cozic.net/help/e2ee.html */} {_('Status')} diff --git a/ReactNativeClient/lib/joplin-database.js b/ReactNativeClient/lib/joplin-database.js index 227e1d0d23..7791b4610b 100644 --- a/ReactNativeClient/lib/joplin-database.js +++ b/ReactNativeClient/lib/joplin-database.js @@ -206,7 +206,7 @@ class JoplinDatabase extends Database { 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 http://joplin.cozic.net and try again.'); + 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. diff --git a/Tools/build-website.js b/Tools/build-website.js index f13eecebda..35c8c17201 100644 --- a/Tools/build-website.js +++ b/Tools/build-website.js @@ -298,7 +298,7 @@ function markdownToHtml(md) { function renderFileToHtml(sourcePath, targetPath, params) { const md = fs.readFileSync(sourcePath, 'utf8'); - params.baseUrl = 'http://joplin.cozic.net'; + params.baseUrl = 'https://joplin.cozic.net'; params.imageBaseUrl = params.baseUrl + '/images'; const html = Mustache.render(markdownToHtml(md), params); fs.writeFileSync(targetPath, html); diff --git a/readme/donate.md b/readme/donate.md index c4207ac424..36237c6d51 100644 --- a/readme/donate.md +++ b/readme/donate.md @@ -19,5 +19,5 @@ There are various ways to send a donation: There are other ways to support the development of Joplin: - Consider rating the app on [Google Play](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) or [App Store](https://itunes.apple.com/us/app/joplin/id1315599797). -- [Create of update a translation](http://joplin.cozic.net/#localisation). +- [Create of update a translation](https://joplin.cozic.net/#localisation). - Help with the [documentation](https://github.com/laurent22/joplin). \ No newline at end of file diff --git a/readme/e2ee.md b/readme/e2ee.md index 3061c0d4e0..c963d23d19 100644 --- a/readme/e2ee.md +++ b/readme/e2ee.md @@ -27,4 +27,4 @@ Follow the same procedure as above but instead disable E2EE on each device one b # Technical specification -For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](http://joplin.cozic.net/help/spec). \ No newline at end of file +For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](https://joplin.cozic.net/help/spec). \ No newline at end of file diff --git a/readme/terminal.md b/readme/terminal.md index 0089d08afd..97283279ce 100644 --- a/readme/terminal.md +++ b/readme/terminal.md @@ -2,7 +2,7 @@ Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor. -Notes exported from Evernote via .enex files [can be imported](http://joplin.cozic.net/#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported. +Notes exported from Evernote via .enex files [can be imported](https://joplin.cozic.net/#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported. The notes can be [synchronised](#synchronisation) with various targets including the file system (for example with a network directory) or with Microsoft OneDrive. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.