aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2021-02-22
|\ | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1351
| * Translated using Weblate (Chinese (Simplified))Kana2021-02-22
| | | | | | | | | | | | | | Currently translated at 99.8% (684 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
| * Translated using Weblate (Korean)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | Currently translated at 66.8% (458 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * Translated using Weblate (Korean)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | Currently translated at 66.7% (457 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * Translated using Weblate (Japanese)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Italian)Ben Is2021-02-21
| | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * Translated using Weblate (Esperanto)Tirifto2021-02-20
|/ | | | | | | Currently translated at 100.0% (683 of 683 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
* Merge branch 'feat/reason-in-registration' into 'develop'Shpuld Shpludson2021-02-20
|\ | | | | | | | | | | | | Close #1047 - add reason field for registration when needed Closes #1047 See merge request pleroma/pleroma-fe!1347
| * changelogShpuld Shpuldson2021-02-15
| |
| * Merge branch 'develop' into feat/reason-in-registrationShpuld Shpuldson2021-02-15
| |\
| * | add reason field when approval is requiredShpuld Shpuldson2021-02-15
| | |
* | | Merge branch 'fix/poll-type-text-overflow' into 'develop'HJ2021-02-20
|\ \ \ | | | | | | | | | | | | | | | | add padding to poll type to not have arrow icon overlap text See merge request pleroma/pleroma-fe!1345
| * | | add padding to poll type to not have arrow icon overlap textShpuld Shpuldson2021-02-15
| |/ /
* | | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2021-02-20
|\ \ \ | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1348
| * | | Translated using Weblate (Chinese (Simplified))Kana2021-02-15
|/ / / | | | | | | | | | | | | | | | | | | Currently translated at 99.8% (682 of 683 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
* | | Merge branch 'chore/mailmap' into 'develop'rinpatch2021-02-15
|\ \ \ | |_|/ |/| | | | | | | | Add myself to .mailmap See merge request pleroma/pleroma-fe!1349
| * | Add myself to .mailmaprinpatch2021-02-15
|/ / | | | | | | I changed my email to rin@patch.cx
* | Merge branch 'fix/weblate-conflicts' into 'develop'HJ2021-02-15
|\ \ | |/ |/| | | | | Merge Weblate updates See merge request pleroma/pleroma-fe!1346
| * Merge Weblate updatesrinpatch2021-02-15
|/| | | | | | | There was a merge conflict so it had to be done manually.
| * Translated using Weblate (Japanese)Ryo Ueno2021-02-14
| | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Italian)Ben Is2021-02-14
| | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * Translated using Weblate (Russian)rinpatch2021-02-13
| | | | | | | | | | | | | | Currently translated at 83.6% (573 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * Translated using Weblate (Italian)Ben Is2021-02-12
| | | | | | | | | | | | | | Currently translated at 100.0% (682 of 682 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * Translated using Weblate (Korean)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | Currently translated at 57.3% (390 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * Translated using Weblate (Japanese)Anonymous2021-02-12
| | | | | | | | | | | | | | Currently translated at 98.8% (672 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Japanese)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | Currently translated at 98.8% (672 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Japanese)Anonymous2021-02-12
| | | | | | | | | | | | | | Currently translated at 98.0% (667 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Japanese)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | Currently translated at 98.0% (667 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * Translated using Weblate (Spanish)tarteka2021-02-12
| | | | | | | | | | | | | | Currently translated at 100.0% (680 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| * Translated using Weblate (Italian)Ben Is2021-02-12
| | | | | | | | | | | | | | Currently translated at 100.0% (680 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * Translated using Weblate (Chinese (Traditional))Snow2021-02-12
| | | | | | | | | | | | | | Currently translated at 100.0% (679 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
| * Translated using Weblate (Chinese (Traditional))Snow2021-02-12
| | | | | | | | | | | | | | Currently translated at 100.0% (679 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
| * Translated using Weblate (Chinese (Traditional))Snow2021-02-12
| | | | | | | | | | | | | | Currently translated at 99.2% (674 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
| * Translated using Weblate (French)LibertAdmin2021-02-12
| | | | | | | | | | | | | | Currently translated at 98.2% (667 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
| * Translated using Weblate (Norwegian Bokmål)fiftyffs2021-02-12
| | | | | | | | | | | | | | Currently translated at 70.1% (476 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nb_NO/
* | Merge branch 'fix/usercard-use-general-roles' into 'develop'Shpuld Shpludson2021-02-15
|\ \ | |/ |/| | | | | User card: use general.role instead of card-specific roles See merge request pleroma/pleroma-fe!1344
| * User card: use general.role instead of card-specific rolesrinpatch2021-02-13
|/ | | | | Also removes admin_menu.roles from some localizations since it is not used anywhere
* Merge branch 'multi-choice-poll-wording' into 'develop'Shpuld Shpludson2021-02-12
|\ | | | | | | | | | | | | Display 'people voted' instead of 'votes' for multi-answers polls Closes #993 See merge request pleroma/pleroma-fe!1341
| * Ensure poll.voters_count doesn't fallback to poll.votes when it's 0eugenijm2021-02-12
| |
| * Apply 1 suggestion(s) to 1 file(s)Eugenij2021-02-10
| |
| * Display 'people voted' instead of 'votes' for multi-choice pollseugenijm2021-02-09
| |
* | Merge branch 'fix/localize-bot-label' into 'develop'Shpuld Shpludson2021-02-12
|\ \ | | | | | | | | | | | | Make bot label localizable See merge request pleroma/pleroma-fe!1342
| * | Make bot label localizablerinpatch2021-02-12
|/ /
* | Merge branch 'staff-grouping' into 'develop'Shpuld Shpludson2021-02-12
|\ \ | |/ |/| | | | | | | | | Group staff by role in the About page Closes #737 See merge request pleroma/pleroma-fe!1309
| * Group staff members by role in the About pageeugenijm2020-12-18
| |
* | Merge branch 'reactbutton-consistency' into 'develop'HJ2021-02-09
|\ \ | | | | | | | | | | | | Some fixes for reactbutton/extrabuttons See merge request pleroma/pleroma-fe!1340
| * | Cleanup ReactButton's CSS, fix hitboxes of reactbutton and extrabuttonsHenry Jameson2021-02-03
| | |
| * | change react button classnames for consistencyHenry Jameson2021-02-01
| | |
* | | Merge branch 'fix-otp-login-kbd' into 'develop'HJ2021-02-03
|\| | | | | | | | | | | | | | | | | | | | Fix #1033 as well as other (potential) similar issues Closes #1033 See merge request pleroma/pleroma-fe!1338
| * | fix a bunch of <button>s acting as submit buttons breaking enter keyHenry Jameson2021-02-01
| | |