diff options
author | Travis CI <travis@Traviss-Mac.local> | 2021-02-07 21:43:22 +0000 |
---|---|---|
committer | Travis CI <travis@Traviss-Mac.local> | 2021-02-07 21:43:22 +0000 |
commit | 48d69e69034e6b820078fe9d859204950cfabfb9 (patch) | |
tree | 56d21d43ebeb95dbcf22d81f2d352a190191ae19 | |
parent | 5.6.0-nightly.14 and trigger AppVeyor nightly build [skip travisci] (diff) | |
parent | docs: add k0staa as a contributor (#1193) (diff) | |
download | ferdium-app-48d69e69034e6b820078fe9d859204950cfabfb9.tar.gz ferdium-app-48d69e69034e6b820078fe9d859204950cfabfb9.tar.zst ferdium-app-48d69e69034e6b820078fe9d859204950cfabfb9.zip |
Merge remote-tracking branch 'source/develop' into HEAD [skip ci]
-rw-r--r-- | .all-contributorsrc | 9 | ||||
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc index b8f57fb93..d0dd712eb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc | |||
@@ -794,6 +794,15 @@ | |||
794 | "contributions": [ | 794 | "contributions": [ |
795 | "code" | 795 | "code" |
796 | ] | 796 | ] |
797 | }, | ||
798 | { | ||
799 | "login": "k0staa", | ||
800 | "name": "Michał Kostewicz", | ||
801 | "avatar_url": "https://avatars.githubusercontent.com/u/6313392?v=4", | ||
802 | "profile": "http://code-addict.pl", | ||
803 | "contributions": [ | ||
804 | "code" | ||
805 | ] | ||
797 | } | 806 | } |
798 | ], | 807 | ], |
799 | "contributorsPerLine": 6, | 808 | "contributorsPerLine": 6, |
@@ -14,7 +14,7 @@ | |||
14 | <p align="center"> | 14 | <p align="center"> |
15 | <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF"> | 15 | <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF"> |
16 | <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> | 16 | <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> |
17 | <a href='#contributors-'><img src='https://img.shields.io/badge/contributors-80-default.svg?logo=github' alt='Contributors'/></a> | 17 | <a href='#contributors-'><img src='https://img.shields.io/badge/contributors-81-default.svg?logo=github' alt='Contributors'/></a> |
18 | <!-- ALL-CONTRIBUTORS-BADGE:END --> | 18 | <!-- ALL-CONTRIBUTORS-BADGE:END --> |
19 | <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a> | 19 | <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a> |
20 | <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a> | 20 | <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a> |
@@ -434,6 +434,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d | |||
434 | <tr> | 434 | <tr> |
435 | <td align="center"><a href="https://github.com/kawarimidoll"><img src="https://avatars0.githubusercontent.com/u/8146876?v=4?s=40" width="40px;" alt=""/><br /><sub><b>カワリミ人形</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kawarimidoll" title="Documentation">📖</a></td> | 435 | <td align="center"><a href="https://github.com/kawarimidoll"><img src="https://avatars0.githubusercontent.com/u/8146876?v=4?s=40" width="40px;" alt=""/><br /><sub><b>カワリミ人形</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kawarimidoll" title="Documentation">📖</a></td> |
436 | <td align="center"><a href="https://immortal-pc.info/"><img src="https://avatars0.githubusercontent.com/u/5358076?v=4?s=40" width="40px;" alt=""/><br /><sub><b>1mm0rt41PC</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=1mm0rt41PC" title="Code">💻</a></td> | 436 | <td align="center"><a href="https://immortal-pc.info/"><img src="https://avatars0.githubusercontent.com/u/5358076?v=4?s=40" width="40px;" alt=""/><br /><sub><b>1mm0rt41PC</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=1mm0rt41PC" title="Code">💻</a></td> |
437 | <td align="center"><a href="http://code-addict.pl"><img src="https://avatars.githubusercontent.com/u/6313392?v=4?s=40" width="40px;" alt=""/><br /><sub><b>Michał Kostewicz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=k0staa" title="Code">💻</a></td> | ||
437 | </tr> | 438 | </tr> |
438 | </table> | 439 | </table> |
439 | 440 | ||
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 5c3dc21d0..809bfda6e 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -209,7 +209,7 @@ class AccountDashboard extends Component { | |||
209 | </div> | 209 | </div> |
210 | <div className="account__info"> | 210 | <div className="account__info"> |
211 | <H1> | 211 | <H1> |
212 | <span className="username">{`${user.firstname} ${isUsingFranzServer ? user.lastname : ''}`}</span> | 212 | <span className="username">{`${user.firstname} ${user.lastname}`}</span> |
213 | {user.isPremium && ( | 213 | {user.isPremium && ( |
214 | <> | 214 | <> |
215 | {' '} | 215 | {' '} |