diff options
-rw-r--r-- | CHANGELOG.md | 12 | ||||
-rw-r--r-- | README.md | 38 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | src/components/auth/AuthLayout.js | 2 | ||||
-rw-r--r-- | src/components/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 @@ | |||
8 | # [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-13) | 8 | # [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-13) |
9 | Merged Franz v5.3.2 into Ferdi | 9 | Merged Franz v5.3.2 into Ferdi |
10 | 10 | ||
11 | ## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) | 11 | ## [5.3.1](https://github.com/getferdi/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) |
12 | Merge Franz v5.3.1 into Ferdi. | 12 | Merge Franz v5.3.1 into Ferdi. |
13 | 13 | ||
14 | - Enable todos for all users | 14 | - Enable todos for all users |
@@ -16,19 +16,19 @@ Merge Franz v5.3.1 into Ferdi. | |||
16 | 16 | ||
17 | ### Bug Fixes | 17 | ### Bug Fixes |
18 | 18 | ||
19 | * **Windows:** Fix app size in fullscreen ([e210701](https://github.com/kytwb/ferdi/commit/e210701)) | 19 | * **Windows:** Fix app size in fullscreen ([e210701](https://github.com/getferdi/ferdi/commit/e210701)) |
20 | * **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/kytwb/ferdi/commit/42f97b4)) | 20 | * **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/getferdi/ferdi/commit/42f97b4)) |
21 | 21 | ||
22 | 22 | ||
23 | ### Features | 23 | ### Features |
24 | 24 | ||
25 | * **Todos:** Add option to disable todos ([5d03b91](https://github.com/kytwb/ferdi/commit/5d03b91)) | 25 | * **Todos:** Add option to disable todos ([5d03b91](https://github.com/getferdi/ferdi/commit/5d03b91)) |
26 | 26 | ||
27 | 27 | ||
28 | ## [5.3.0](https://github.com/kytwb/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) | 28 | ## [5.3.0](https://github.com/getferdi/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) |
29 | - Removes pages begging you to donate after registration | 29 | - Removes pages begging you to donate after registration |
30 | - Makes all users Premium by default | 30 | - Makes all users Premium by default |
31 | - [Add option to change server to a custom](https://github.com/kytwb/ferdi#servers) [ferdi-server](https://github.com/vantezzen/ferdi-server) | 31 | - [Add option to change server to a custom](https://github.com/getferdi/ferdi#servers) [ferdi-server](https://github.com/getferdi/server) |
32 | - Remove "Franz is better together" popup | 32 | - Remove "Franz is better together" popup |
33 | - Makes RocketChat self-hosted generally available | 33 | - Makes RocketChat self-hosted generally available |
34 | - Comes with a custom branding proper to Ferdi | 34 | - Comes with a custom branding proper to Ferdi |
@@ -4,14 +4,14 @@ | |||
4 | 4 | ||
5 | # Ferdi | 5 | # Ferdi |
6 | 6 | ||
7 | [![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/kytwb/ferdi) | 7 | [![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/getferdi/ferdi) |
8 | [![Build Status Mac & Linux](https://travis-ci.org/kytwb/ferdi.svg?branch=master)](https://travis-ci.org/kytwb/ferdi) | 8 | [![Build Status Mac & Linux](https://travis-ci.org/getferdi/ferdi.svg?branch=master)](https://travis-ci.org/getferdi/ferdi) |
9 | 9 | ||
10 | π€΄π½ Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. | 10 | π€΄π½ Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. |
11 | 11 | ||
12 | ## Download Ferdi | 12 | ## Download Ferdi |
13 | 13 | ||
14 | You can find the installers in the [latest release](https://github.com/kytwb/ferdi/releases) assets. | 14 | You can find the installers in the [latest release](https://github.com/getferdi/ferdi/releases) assets. |
15 | 15 | ||
16 | ### Or use homebrew (macOS only) | 16 | ### Or use homebrew (macOS only) |
17 | 17 | ||
@@ -22,18 +22,18 @@ You can find the installers in the [latest release](https://github.com/kytwb/fer | |||
22 | ## Ferdi-specific Features | 22 | ## Ferdi-specific Features |
23 | - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade | 23 | - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade |
24 | - [x] Removes pages begging you to donate after registration | 24 | - [x] Removes pages begging you to donate after registration |
25 | - [x] Makes all users Premium by default ([#15](https://github.com/kytwb/ferdi/issues/15)) | 25 | - [x] Makes all users Premium by default ([#15](https://github.com/getferdi/ferdi/issues/15)) |
26 | - [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) | 26 | - [x] [Add option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server) |
27 | - [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879)) | 27 | - [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879)) |
28 | - [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)) | 28 | - [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)) |
29 | - [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/kytwb/ferdi/issues/37)) | 29 | - [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37)) |
30 | - [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)) | 30 | - [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)) |
31 | - [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)) | 31 | - [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)) |
32 | - [x] Add "npm run prepare-code" command for development to lint and beautify code | 32 | - [x] Add "npm run prepare-code" command for development to lint and beautify code |
33 | - [x] Remove "Franz is better together" popup | 33 | - [x] Remove "Franz is better together" popup |
34 | - [x] Remove bug that would incorrectly display unread messages count on some services (more info in [7566ccd](https://github.com/getferdi/ferdi/commit/7566ccd)) | 34 | - [x] Remove bug that would incorrectly display unread messages count on some services (more info in [7566ccd](https://github.com/getferdi/ferdi/commit/7566ccd)) |
35 | - [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/kytwb/ferdi/wiki/Custom-Todo) | 35 | - [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/getferdi/ferdi/wiki/Custom-Todo) |
36 | - [x] Makes RocketChat self-hosted generally available ([#6](https://github.com/kytwb/ferdi/issues/6)) | 36 | - [x] Makes RocketChat self-hosted generally available ([#6](https://github.com/getferdi/ferdi/issues/6)) |
37 | - [x] Comes with a custom branding proper to Ferdi | 37 | - [x] Comes with a custom branding proper to Ferdi |
38 | 38 | ||
39 | ## Development | 39 | ## Development |
@@ -83,18 +83,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d | |||
83 | <!-- markdownlint-disable --> | 83 | <!-- markdownlint-disable --> |
84 | <table> | 84 | <table> |
85 | <tr> | 85 | <tr> |
86 | <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/commits?author=vantezzen" title="Code">π»</a> <a href="#design-vantezzen" title="Design">π¨</a> <a href="https://github.com/kytwb/ferdi/commits?author=vantezzen" title="Documentation">π</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">π€</a> <a href="#translation-vantezzen" title="Translation">π</a> <a href="#example-vantezzen" title="Examples">π‘</a> <a href="https://github.com/kytwb/ferdi/issues?q=author%3Avantezzen" title="Bug reports">π</a> <a href="#content-vantezzen" title="Content">π</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">π</a> <a href="#userTesting-vantezzen" title="User Testing">π</a> <a href="#question-vantezzen" title="Answering Questions">π¬</a> <a href="#projectManagement-vantezzen" title="Project Management">π</a> <a href="#review-vantezzen" title="Reviewed Pull Requests">π</a></td> | 86 | <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">π»</a> <a href="#design-vantezzen" title="Design">π¨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">π</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">π€</a> <a href="#translation-vantezzen" title="Translation">π</a> <a href="#example-vantezzen" title="Examples">π‘</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">π</a> <a href="#content-vantezzen" title="Content">π</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">π</a> <a href="#userTesting-vantezzen" title="User Testing">π</a> <a href="#question-vantezzen" title="Answering Questions">π¬</a> <a href="#projectManagement-vantezzen" title="Project Management">π</a> <a href="#review-vantezzen" title="Reviewed Pull Requests">π</a></td> |
87 | <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/commits?author=adlk" title="Code">π»</a> <a href="#content-adlk" title="Content">π</a> <a href="#design-adlk" title="Design">π¨</a> <a href="https://github.com/kytwb/ferdi/commits?author=adlk" title="Documentation">π</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">π€</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">π</a> <a href="#projectManagement-adlk" title="Project Management">π</a> <a href="https://github.com/kytwb/ferdi/commits?author=adlk" title="Tests">β οΈ</a> <a href="#translation-adlk" title="Translation">π</a></td> | 87 | <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">π»</a> <a href="#content-adlk" title="Content">π</a> <a href="#design-adlk" title="Design">π¨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">π</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">π€</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">π</a> <a href="#projectManagement-adlk" title="Project Management">π</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">β οΈ</a> <a href="#translation-adlk" title="Translation">π</a></td> |
88 | <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt="Amine Mouafik"/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="#question-kytwb" title="Answering Questions">π¬</a> <a href="https://github.com/kytwb/ferdi/commits?author=kytwb" title="Code">π»</a> <a href="https://github.com/kytwb/ferdi/commits?author=kytwb" title="Documentation">π</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">π€</a> <a href="#maintenance-kytwb" title="Maintenance">π§</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">π¦</a> <a href="#projectManagement-kytwb" title="Project Management">π</a> <a href="#review-kytwb" title="Reviewed Pull Requests">π</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">π</a></td> | 88 | <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt="Amine Mouafik"/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="#question-kytwb" title="Answering Questions">π¬</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">π»</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">π</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">π€</a> <a href="#maintenance-kytwb" title="Maintenance">π§</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">π¦</a> <a href="#projectManagement-kytwb" title="Project Management">π</a> <a href="#review-kytwb" title="Reviewed Pull Requests">π</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">π</a></td> |
89 | <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/commits?author=ZeroCool940711" title="Code">π»</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">π€</a></td> | 89 | <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">π»</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">π€</a></td> |
90 | <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/commits?author=rseitbekov" title="Code">π»</a></td> | 90 | <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">π»</a></td> |
91 | <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt="Peter Bittner"/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">π€</a> <a href="https://github.com/kytwb/ferdi/issues?q=author%3Abittner" title="Bug reports">π</a></td> | 91 | <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt="Peter Bittner"/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">π€</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">π</a></td> |
92 | </tr> | 92 | </tr> |
93 | <tr> | 93 | <tr> |
94 | <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">π</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">π€</a></td> | 94 | <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">π</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">π€</a></td> |
95 | <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">π€</a></td> | 95 | <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">π€</a></td> |
96 | <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">π€</a></td> | 96 | <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">π€</a></td> |
97 | <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/issues?q=author%3Adayzlun" title="Bug reports">π</a></td> | 97 | <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">π</a></td> |
98 | <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias GΓΌnther"/><br /><sub><b>Tobias GΓΌnther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">π€</a></td> | 98 | <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias GΓΌnther"/><br /><sub><b>Tobias GΓΌnther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">π€</a></td> |
99 | <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">π¦</a></td> | 99 | <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">π¦</a></td> |
100 | </tr> | 100 | </tr> |
diff --git a/package.json b/package.json index 84228befc..8c137e312 100644 --- a/package.json +++ b/package.json | |||
@@ -6,8 +6,8 @@ | |||
6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
7 | "copyright": "kytwb", | 7 | "copyright": "kytwb", |
8 | "main": "index.js", | 8 | "main": "index.js", |
9 | "homepage": "https://github.com/kytwb/ferdi", | 9 | "homepage": "https://github.com/getferdi/ferdi", |
10 | "repository": "https://github.com/kytwb/ferdi.git", | 10 | "repository": "https://github.com/getferdi/ferdi.git", |
11 | "private": true, | 11 | "private": true, |
12 | "scripts": { | 12 | "scripts": { |
13 | "prestart": "npm run rebuild", | 13 | "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 { | |||
87 | })} | 87 | })} |
88 | </div> | 88 | </div> |
89 | {/* </div> */} | 89 | {/* </div> */} |
90 | <Link to="https://github.com/kytwb/ferdi" className="auth__adlk" target="_blank"> | 90 | <Link to="https://github.com/getferdi/ferdi" className="auth__adlk" target="_blank"> |
91 | <img src="./assets/images/adlk.svg" alt="" /> | 91 | <img src="./assets/images/adlk.svg" alt="" /> |
92 | </Link> | 92 | </Link> |
93 | </div> | 93 | </div> |
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 { | |||
217 | {' '} | 217 | {' '} |
218 | or | 218 | or |
219 | {' '} | 219 | {' '} |
220 | <a href="https://github.com/vantezzen/ferdi-server" target="_blank">using a self-hosted ferdi-server</a> | 220 | <a href="https://github.com/getferdi/server" target="_blank">using a self-hosted ferdi-server</a> |
221 | {' '} | 221 | {' '} |
222 | (if you have the knowledge and resources to do so). | 222 | (if you have the knowledge and resources to do so). |
223 | <br /> | 223 | <br /> |