aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Benjamin Staneck <Stanzilla@users.noreply.github.com>2018-11-15 11:49:00 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-11-15 11:49:00 +0100
commit04a23b7ffec2387c204638a61550e5137d7367fe (patch)
treeb6f6f27fa821111bbf3933c38d370c390bf6be2d
parentAutomatic i18n update (i18n.meetfranz.com) (diff)
downloadferdium-app-04a23b7ffec2387c204638a61550e5137d7367fe.tar.gz
ferdium-app-04a23b7ffec2387c204638a61550e5137d7367fe.tar.zst
ferdium-app-04a23b7ffec2387c204638a61550e5137d7367fe.zip
fix(General): Convert many links from http to https (#967) @Stanzilla
-rw-r--r--CHANGELOG.md6
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md2
-rw-r--r--src/components/auth/Signup.js4
-rw-r--r--src/config.js4
-rw-r--r--src/lib/Menu.js4
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 @@
4### General 4### General
5 5
6* **App:** Various performance improvments 6* **App:** Various performance improvments
7* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** 7* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
8 8
9 9
10### Features 10### Features
@@ -29,7 +29,7 @@
29 29
30### General 30### General
31* **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1)) 31* **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
32* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** 32* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
33 33
34### Features 34### Features
35* **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44)) 35* **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
100* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) 100* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
101* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) 101* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
102* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu)) 102* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
103* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)** 103* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)**
104 104
105 105
106### Bug Fixes 106### 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
33* When only changing documentation, include `[ci skip]` in the commit description 33* When only changing documentation, include `[ci skip]` in the commit description
34 34
35### Javascript 35### Javascript
36* Please use `es-lint` and the defined rules to maintain a consistent style 36* 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 @@
5 5
6# Franz 5 (beta) 6# Franz 5 (beta)
7[![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master) 7[![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master)
8 [![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) 8 [![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)
9 9
10Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more. 10Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.
11 11
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 {
187 {intl.formatMessage(messages.legalInfo)} 187 {intl.formatMessage(messages.legalInfo)}
188 <br /> 188 <br />
189 <Link 189 <Link
190 to="http://meetfranz.com/terms" 190 to="https://meetfranz.com/terms"
191 target="_blank" 191 target="_blank"
192 className="link" 192 className="link"
193 > 193 >
@@ -195,7 +195,7 @@ export default class Signup extends Component {
195 </Link> 195 </Link>
196 &nbsp;&amp;&nbsp; 196 &nbsp;&amp;&nbsp;
197 <Link 197 <Link
198 to="http://meetfranz.com/privacy" 198 to="https://meetfranz.com/privacy"
199 target="_blank" 199 target="_blank"
200 className="link" 200 className="link"
201 > 201 >
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 = {
24 enableGPUAcceleration: true, 24 enableGPUAcceleration: true,
25}; 25};
26 26
27export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request'; 27export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request';
28export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate'; 28export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate';
29 29
30export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json'); 30export 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 => [
285 submenu: [ 285 submenu: [
286 { 286 {
287 label: intl.formatMessage(menuItems.learnMore), 287 label: intl.formatMessage(menuItems.learnMore),
288 click() { shell.openExternal('http://meetfranz.com'); }, 288 click() { shell.openExternal('https://meetfranz.com'); },
289 }, 289 },
290 { 290 {
291 label: intl.formatMessage(menuItems.changelog), 291 label: intl.formatMessage(menuItems.changelog),
@@ -296,7 +296,7 @@ const _templateFactory = intl => [
296 }, 296 },
297 { 297 {
298 label: intl.formatMessage(menuItems.support), 298 label: intl.formatMessage(menuItems.support),
299 click() { shell.openExternal('http://meetfranz.com/support'); }, 299 click() { shell.openExternal('https://meetfranz.com/support'); },
300 }, 300 },
301 { 301 {
302 type: 'separator', 302 type: 'separator',