From 04a23b7ffec2387c204638a61550e5137d7367fe Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 15 Nov 2018 11:49:00 +0100 Subject: [PATCH] fix(General): Convert many links from http to https (#967) @Stanzilla --- CHANGELOG.md | 6 +++--- CONTRIBUTING.md | 2 +- README.md | 2 +- src/components/auth/Signup.js | 4 ++-- src/config.js | 4 ++-- src/lib/Menu.js | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d5364ef1..a249b5905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### General * **App:** Various performance improvments -* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** +* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)** ### Features @@ -29,7 +29,7 @@ ### General * **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1)) -* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** +* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)** ### Features * **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44)) @@ -100,7 +100,7 @@ fix(App): Bugfix Fix memory leak in recipe polling loop * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) * **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu)) -* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)** +* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)** ### Bug Fixes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad5989964..57146bd43 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,4 +33,4 @@ As a basic rule, before filing issues, feature requests or anything else. Take a * When only changing documentation, include `[ci skip]` in the commit description ### Javascript -* Please use `es-lint` and the defined rules to maintain a consistent style +* Please use `es-lint` and the defined rules to maintain a consistent style diff --git a/README.md b/README.md index 099100284..ab30e1d31 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Franz 5 (beta) [![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master) - [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://meetfranz.com/payment.html) + [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html) Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more. diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 219948274..923aa456d 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -187,7 +187,7 @@ export default class Signup extends Component { {intl.formatMessage(messages.legalInfo)}
@@ -195,7 +195,7 @@ export default class Signup extends Component {  &  diff --git a/src/config.js b/src/config.js index 77fa92eca..417e45022 100644 --- a/src/config.js +++ b/src/config.js @@ -24,7 +24,7 @@ export const DEFAULT_APP_SETTINGS = { enableGPUAcceleration: true, }; -export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request'; -export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate'; +export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request'; +export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate'; export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json'); diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 19b8d5b15..bdaf203c5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -285,7 +285,7 @@ const _templateFactory = intl => [ submenu: [ { label: intl.formatMessage(menuItems.learnMore), - click() { shell.openExternal('http://meetfranz.com'); }, + click() { shell.openExternal('https://meetfranz.com'); }, }, { label: intl.formatMessage(menuItems.changelog), @@ -296,7 +296,7 @@ const _templateFactory = intl => [ }, { label: intl.formatMessage(menuItems.support), - click() { shell.openExternal('http://meetfranz.com/support'); }, + click() { shell.openExternal('https://meetfranz.com/support'); }, }, { type: 'separator',