Skip to content

Commit

Permalink
fix(General): Convert many links from http to https (#967) @Stanzilla
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanzilla authored and adlk committed Nov 15, 2018
1 parent 0ac7cef commit 04a23b7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions src/components/auth/Signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ export default class Signup extends Component {
{intl.formatMessage(messages.legalInfo)}
<br />
<Link
to="http://meetfranz.com/terms"
to="https://meetfranz.com/terms"
target="_blank"
className="link"
>
{intl.formatMessage(messages.terms)}
</Link>
&nbsp;&amp;&nbsp;
<Link
to="http://meetfranz.com/privacy"
to="https://meetfranz.com/privacy"
target="_blank"
className="link"
>
Expand Down
4 changes: 2 additions & 2 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
4 changes: 2 additions & 2 deletions src/lib/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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',
Expand Down

0 comments on commit 04a23b7

Please sign in to comment.