From e04dd53e86bc05f0a6e861005af66b9d13d2eed9 Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sat, 28 Sep 2019 20:41:21 -0400
Subject: Change Release for Electron

---
 src/lib/Menu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5b04346b5..77feb8e85 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -826,7 +826,7 @@ export default class FranzMenu {
           type: 'info',
           title: 'Franz Ferdinand',
           message: 'Ferdi',
-          detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+          detail: `Version: ${remote.app.getVersion()}\nElectron: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
         });
       },
     };
-- 
cgit v1.2.3-54-g00ecf


From 1e83be5b6cff533c14125da3ad6abf7e2d7397b4 Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sat, 28 Sep 2019 22:13:08 -0400
Subject: Replace leftover Franz references

---
 src/lib/Menu.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 77feb8e85..e8cd550e4 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -442,7 +442,7 @@ const _templateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('https://meetfranz.com'); },
+        click() { shell.openExternal('https://getferdi.com'); },
       },
       {
         label: intl.formatMessage(menuItems.announcement),
@@ -456,18 +456,18 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('https://meetfranz.com/support'); },
+        click() { shell.openExternal('https://getferdi.com/contact'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('https://getferdi.com/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('https://getferdi.com/privacy'); },
       },
     ],
   },
@@ -637,29 +637,29 @@ const _titleBarTemplateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('https://meetfranz.com'); },
+        click() { shell.openExternal('https://getferdi.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
-        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+        click() { shell.openExternal('https://github.com/getferdi/ferdi/blob/master/CHANGELOG.md'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('https://meetfranz.com/support'); },
+        click() { shell.openExternal('https://getferdi.com/contact'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('https://getferdi.com/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('https://getferdi.com/privacy'); },
       },
     ],
   },
-- 
cgit v1.2.3-54-g00ecf


From 0be8eb218e3af03f37238c05257e7408a53c1af3 Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 11:37:10 -0400
Subject: Add dynamic change for TOS and Privacy

---
 src/components/auth/Signup.js | 3 +++
 src/lib/Menu.js               | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index b36e71ce1..10b124690 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -119,6 +119,9 @@ export default @observer class Signup extends Component {
 
     const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
 
+    //This is the change for the issue #80, need testing
+	const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com';
+
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e8cd550e4..65e0326da 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://getferdi.com/terms'); },
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://getferdi.com/privacy'); },
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
       },
     ],
   },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://getferdi.com/terms'); },
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://getferdi.com/privacy'); },
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
       },
     ],
   },
-- 
cgit v1.2.3-54-g00ecf


From 375a00d22027f9de68043e32597d7bf43392a9ce Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 11:49:20 -0400
Subject: Trying to fix the code for Signup.js

---
 src/components/auth/Signup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 10b124690..88c742a54 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -117,7 +117,8 @@ export default @observer class Signup extends Component {
     const { intl } = this.context;
     const { isSubmitting, loginRoute, error } = this.props;
 
-    const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
+    //Old code before my commit
+    //const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
 
     //This is the change for the issue #80, need testing
 	const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com';
-- 
cgit v1.2.3-54-g00ecf


From a87a8002cee27ced41acaee8211ebdf3072ebf4c Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 12:46:41 -0400
Subject: Revert Signup.js and updated Menu.js

---
 src/components/auth/Signup.js | 6 +-----
 src/lib/Menu.js               | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 88c742a54..b36e71ce1 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -117,11 +117,7 @@ export default @observer class Signup extends Component {
     const { intl } = this.context;
     const { isSubmitting, loginRoute, error } = this.props;
 
-    //Old code before my commit
-    //const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
-
-    //This is the change for the issue #80, need testing
-	const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com';
+    const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
 
     return (
       <div className="auth__scroll-container">
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 65e0326da..6afb63c83 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },
-- 
cgit v1.2.3-54-g00ecf


From f33e661402012249cd8d7c9c8a7f0ff9e42b249e Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 12:54:48 -0400
Subject: Change quote ' to `

---
 src/lib/Menu.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 6afb63c83..e6e5bbe87 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('${termsBase}/terms'); },
+        click() { shell.openExternal(`${termsBase}/terms`); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('${termsBase}/privacy'); },
+        click() { shell.openExternal(`${termsBase}/privacy`); },
       },
     ],
   },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('${termsBase}/terms'); },
+        click() { shell.openExternal(`${termsBase}/terms`); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('${termsBase}/privacy'); },
+        click() { shell.openExternal(`${termsBase}/privacy`); },
       },
     ],
   },
-- 
cgit v1.2.3-54-g00ecf


From 4fb775ff4df67f46cf2a8170469f81fa56582d13 Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 13:02:25 -0400
Subject: Revert again

---
 src/components/auth/Signup.js | 4 ++--
 src/lib/Menu.js               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index b36e71ce1..a979049ac 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -165,7 +165,7 @@ export default @observer class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to={`${termsBase}/terms`}
+                to={'${termsBase}/terms'}
                 target="_blank"
                 className="link"
               >
@@ -173,7 +173,7 @@ export default @observer class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to={`${termsBase}/privacy`}
+                to={'${termsBase}/privacy'}
                 target="_blank"
                 className="link"
               >
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e6e5bbe87..6afb63c83 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal(`${termsBase}/terms`); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal(`${termsBase}/privacy`); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal(`${termsBase}/terms`); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal(`${termsBase}/privacy`); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },
-- 
cgit v1.2.3-54-g00ecf


From d96ac4afb086c1c9296f0b78f092404bda204f88 Mon Sep 17 00:00:00 2001
From: Makazzz <makazzzpro@live.ca>
Date: Sun, 29 Sep 2019 13:23:56 -0400
Subject: Update Signup.js

---
 src/components/auth/Signup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index a979049ac..b36e71ce1 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -165,7 +165,7 @@ export default @observer class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to={'${termsBase}/terms'}
+                to={`${termsBase}/terms`}
                 target="_blank"
                 className="link"
               >
@@ -173,7 +173,7 @@ export default @observer class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to={'${termsBase}/privacy'}
+                to={`${termsBase}/privacy`}
                 target="_blank"
                 className="link"
               >
-- 
cgit v1.2.3-54-g00ecf