diff options
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 4 | ||||
-rw-r--r-- | src/config.js | 4 | ||||
-rw-r--r-- | src/lib/Menu.js | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cdc89b325..38cba0829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | ### General | 46 | ### General |
47 | * **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1)) | 47 | * **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1)) |
48 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | 48 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)** |
49 | 49 | ||
50 | ### Features | 50 | ### Features |
51 | * **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44)) | 51 | * **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44)) |
@@ -116,7 +116,7 @@ fix(App): Bugfix Fix memory leak in recipe polling loop | |||
116 | * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) | 116 | * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) |
117 | * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) | 117 | * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) |
118 | * **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu)) | 118 | * **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu)) |
119 | * **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)** | 119 | * **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)** |
120 | 120 | ||
121 | 121 | ||
122 | ### Bug Fixes | 122 | ### 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 |
@@ -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 | ||
10 | Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more. | 10 | Messaging 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 | & | 196 | & |
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 | ||
27 | export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request'; | 27 | export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request'; |
28 | export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate'; | 28 | export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate'; |
29 | 29 | ||
30 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json'); | 30 | 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 => [ | |||
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', |