From cba99de2ca02a02f02eded936d7c43c3176b4806 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 19:58:11 +0700 Subject: Fix GitHub links to reflect Ferdi org --- CHANGELOG.md | 12 +++---- README.md | 38 +++++++++++----------- package.json | 4 +-- src/components/auth/AuthLayout.js | 2 +- .../settings/settings/EditSettingsForm.js | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cc156de3..0df1cf631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ # [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-13) Merged Franz v5.3.2 into Ferdi -## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) +## [5.3.1](https://github.com/getferdi/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) Merge Franz v5.3.1 into Ferdi. - Enable todos for all users @@ -16,19 +16,19 @@ Merge Franz v5.3.1 into Ferdi. ### Bug Fixes -* **Windows:** Fix app size in fullscreen ([e210701](https://github.com/kytwb/ferdi/commit/e210701)) -* **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/kytwb/ferdi/commit/42f97b4)) +* **Windows:** Fix app size in fullscreen ([e210701](https://github.com/getferdi/ferdi/commit/e210701)) +* **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/getferdi/ferdi/commit/42f97b4)) ### Features -* **Todos:** Add option to disable todos ([5d03b91](https://github.com/kytwb/ferdi/commit/5d03b91)) +* **Todos:** Add option to disable todos ([5d03b91](https://github.com/getferdi/ferdi/commit/5d03b91)) -## [5.3.0](https://github.com/kytwb/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) +## [5.3.0](https://github.com/getferdi/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) - Removes pages begging you to donate after registration - Makes all users Premium by default -- [Add option to change server to a custom](https://github.com/kytwb/ferdi#servers) [ferdi-server](https://github.com/vantezzen/ferdi-server) +- [Add option to change server to a custom](https://github.com/getferdi/ferdi#servers) [ferdi-server](https://github.com/getferdi/server) - Remove "Franz is better together" popup - Makes RocketChat self-hosted generally available - Comes with a custom branding proper to Ferdi diff --git a/README.md b/README.md index 207493ff3..673da1292 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ # Ferdi -[![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/kytwb/ferdi) - [![Build Status Mac & Linux](https://travis-ci.org/kytwb/ferdi.svg?branch=master)](https://travis-ci.org/kytwb/ferdi) +[![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/getferdi/ferdi) + [![Build Status Mac & Linux](https://travis-ci.org/getferdi/ferdi.svg?branch=master)](https://travis-ci.org/getferdi/ferdi) 🀴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. ## Download Ferdi -You can find the installers in the [latest release](https://github.com/kytwb/ferdi/releases) assets. +You can find the installers in the [latest release](https://github.com/getferdi/ferdi/releases) assets. ### Or use homebrew (macOS only) @@ -22,18 +22,18 @@ You can find the installers in the [latest release](https://github.com/kytwb/fer ## Ferdi-specific Features - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade - [x] Removes pages begging you to donate after registration -- [x] Makes all users Premium by default ([#15](https://github.com/kytwb/ferdi/issues/15)) -- [x] [Add option to change server to a custom](https://github.com/kytwb/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/vantezzen/ferdi-server) +- [x] Makes all users Premium by default ([#15](https://github.com/getferdi/ferdi/issues/15)) +- [x] [Add option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server) - [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879)) -- [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/kytwb/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430)) -- [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/kytwb/ferdi/issues/37)) -- [x] Add an option to auto-hide the menubar ([#7](https://github.com/kytwb/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833)) -- [x] Add CTRL+← and CTRL+β†’ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/kytwb/ferdi/issues/39)) +- [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/getferdi/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430)) +- [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37)) +- [x] Add an option to auto-hide the menubar ([#7](https://github.com/getferdi/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833)) +- [x] Add CTRL+← and CTRL+β†’ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39)) - [x] Add "npm run prepare-code" command for development to lint and beautify code - [x] Remove "Franz is better together" popup - [x] Remove bug that would incorrectly display unread messages count on some services (more info in [7566ccd](https://github.com/getferdi/ferdi/commit/7566ccd)) -- [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/kytwb/ferdi/wiki/Custom-Todo) -- [x] Makes RocketChat self-hosted generally available ([#6](https://github.com/kytwb/ferdi/issues/6)) +- [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/getferdi/ferdi/wiki/Custom-Todo) +- [x] Makes RocketChat self-hosted generally available ([#6](https://github.com/getferdi/ferdi/issues/6)) - [x] Comes with a custom branding proper to Ferdi ## Development @@ -83,18 +83,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - + + + + + + - + - + diff --git a/package.json b/package.json index 84228befc..8c137e312 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", - "homepage": "https://github.com/kytwb/ferdi", - "repository": "https://github.com/kytwb/ferdi.git", + "homepage": "https://github.com/getferdi/ferdi", + "repository": "https://github.com/getferdi/ferdi.git", "private": true, "scripts": { "prestart": "npm run rebuild", diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 641b754ed..0c5198583 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -87,7 +87,7 @@ export default @observer class AuthLayout extends Component { })} {/* */} - + diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index ef6ab2707..012a10aa6 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -217,7 +217,7 @@ export default @observer class EditSettingsForm extends Component { {' '} or {' '} - using a self-hosted ferdi-server + using a self-hosted ferdi-server {' '} (if you have the knowledge and resources to do so).
-- cgit v1.2.3-54-g00ecf
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““ πŸ’¬ πŸ“† πŸ‘€		Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		ZeroCool
ZeroCool
πŸ’» πŸ€”		rseitbekov
rseitbekov
πŸ’»		Peter Bittner
Peter Bittner
πŸ€” πŸ›		Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““ πŸ’¬ πŸ“† πŸ‘€		Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		ZeroCool
ZeroCool
πŸ’» πŸ€”		rseitbekov
rseitbekov
πŸ’»		Peter Bittner
Peter Bittner
πŸ€” πŸ›
Justus Saul
Justus Saul
πŸ› πŸ€”		Justus Saul
Justus Saul
πŸ› πŸ€”		 igreil
igreil
πŸ€”		 Marco Lopes
Marco Lopes
πŸ€”		dayzlun
dayzlun
πŸ›		dayzlun
dayzlun
πŸ›		 Tobias GΓΌnther
Tobias GΓΌnther
πŸ€”		 AGCaesar
AGCaesar
πŸ“¦