Shpuld Shpuldson
a636e53404
add reason field when approval is required
2021-02-15 11:10:09 +02:00
Shpuld Shpludson
44bddf6cd2
Merge branch 'fix/usercard-use-general-roles' into 'develop'
...
User card: use general.role instead of card-specific roles
See merge request pleroma/pleroma-fe!1344
2021-02-15 06:20:55 +00:00
rinpatch
6acf812101
User card: use general.role instead of card-specific roles
...
Also removes admin_menu.roles from some localizations since it is not
used anywhere
2021-02-13 16:34:43 +03:00
Shpuld Shpludson
7f3fd9ca21
Merge branch 'multi-choice-poll-wording' into 'develop'
...
Display 'people voted' instead of 'votes' for multi-answers polls
Closes #993
See merge request pleroma/pleroma-fe!1341
2021-02-12 19:15:42 +00:00
eugenijm
01275fbac0
Ensure poll.voters_count doesn't fallback to poll.votes when it's 0
2021-02-12 19:43:57 +03:00
Shpuld Shpludson
b2a96417cf
Merge branch 'fix/localize-bot-label' into 'develop'
...
Make bot label localizable
See merge request pleroma/pleroma-fe!1342
2021-02-12 13:58:11 +00:00
rinpatch
da807a12fb
Make bot label localizable
2021-02-12 13:48:39 +03:00
Shpuld Shpludson
8b7c367b04
Merge branch 'staff-grouping' into 'develop'
...
Group staff by role in the About page
Closes #737
See merge request pleroma/pleroma-fe!1309
2021-02-12 08:05:55 +00:00
Eugenij
13ff99881b
Apply 1 suggestion(s) to 1 file(s)
2021-02-10 12:28:39 +00:00
eugenijm
1506b97e35
Display 'people voted' instead of 'votes' for multi-choice polls
2021-02-09 16:36:45 +03:00
HJ
647d75f27c
Merge branch 'reactbutton-consistency' into 'develop'
...
Some fixes for reactbutton/extrabuttons
See merge request pleroma/pleroma-fe!1340
2021-02-09 13:12:42 +00:00
Henry Jameson
213c5637d4
Cleanup ReactButton's CSS, fix hitboxes of reactbutton and extrabuttons
2021-02-03 09:18:44 +02:00
HJ
6f3acb3c1b
Merge branch 'fix-otp-login-kbd' into 'develop'
...
Fix #1033 as well as other (potential) similar issues
Closes #1033
See merge request pleroma/pleroma-fe!1338
2021-02-03 06:23:35 +00:00
HJ
7d4c7e3b3f
Merge branch 'settings-changed' into 'develop'
...
Boolean settings improvements
See merge request pleroma/pleroma-fe!1257
2021-02-02 20:27:23 +00:00
Henry Jameson
78f8147aa6
change react button classnames for consistency
2021-02-01 21:07:40 +02:00
Henry Jameson
982c799b6f
fix a bunch of <button>s acting as submit buttons breaking enter key
2021-02-01 21:07:09 +02:00
Henry Jameson
66f3e72b54
update branch with recent develop changes (FA, added settings)
2021-02-01 20:08:36 +02:00
Henry Jameson
8958f386be
Merge remote-tracking branch 'origin/develop' into settings-changed
...
* origin/develop: (306 commits)
fallback if shadows aren't defined
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Portuguese)
Translated using Weblate (Italian)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
...
2021-02-01 19:39:57 +02:00
Shpuld Shpludson
de66267a07
Merge branch 'fix/use-current-app-locale' into 'develop'
...
Use app locale with toLocaleString/toLocaleDateString
See merge request pleroma/pleroma-fe!1301
2021-01-29 08:38:15 +00:00
HJ
6e4a0d408c
Merge branch 'fix-fix-themes' into 'develop'
...
fallback if shadows aren't defined
See merge request pleroma/pleroma-fe!1337
2021-01-28 12:14:28 +00:00
Henry Jameson
2576b75059
fallback if shadows aren't defined
2021-01-28 14:05:32 +02:00
HJ
11963de288
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1327
2021-01-27 06:51:53 +00:00
Snow
79e4df99dc
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 98.5% (669 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
2021-01-25 17:04:16 +00:00
Pavlo Bilous
58a92c1b7d
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (679 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
2021-01-25 17:04:16 +00:00
Ben Is
286527b489
Translated using Weblate (Italian)
...
Currently translated at 100.0% (679 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-01-25 17:04:16 +00:00
rinpatch
bc9cd4170d
Translated using Weblate (Ukrainian)
...
Currently translated at 99.4% (675 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
2021-01-25 17:04:16 +00:00
João Rodrigues
c4fb123d07
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (679 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Ben Is
3b6a30ec9f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (679 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-01-25 17:04:16 +00:00
rinpatch
238e9dcd35
Translated using Weblate (Russian)
...
Currently translated at 83.9% (570 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
2021-01-25 17:04:16 +00:00
Artur Mancha
c3e5fd5fa1
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (679 of 679 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
rinpatch
05e5bb6404
Translated using Weblate (Russian)
...
Currently translated at 83.8% (568 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
2021-01-25 17:04:16 +00:00
João Rodrigues
836fc4d205
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (677 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Ana Margarida Guimarães Ribeiro Cardoso
c8240a48d5
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (677 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Anonymous
d39e918cd3
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (677 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Anonymous
da47d9a43d
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (677 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
João Rodrigues
0c2b425682
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (677 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
André Inácio
ffd673d4a5
Translated using Weblate (Portuguese)
...
Currently translated at 74.0% (501 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Miguel Carreiro
6df5459ec9
Translated using Weblate (Portuguese)
...
Currently translated at 74.0% (501 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Anonymous
c5477e489b
Translated using Weblate (Portuguese)
...
Currently translated at 74.0% (501 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
João Rodrigues
cdd632f04c
Translated using Weblate (Portuguese)
...
Currently translated at 74.0% (501 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Miguel Carreiro
e9c5e06f50
Translated using Weblate (Portuguese)
...
Currently translated at 71.9% (487 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Afonso Pereira
a9cbf3eafe
Translated using Weblate (Portuguese)
...
Currently translated at 71.9% (487 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Afonso Pereira
ac43a8145b
Translated using Weblate (Portuguese)
...
Currently translated at 70.0% (474 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Dr. António
21eac51029
Translated using Weblate (Portuguese)
...
Currently translated at 70.0% (474 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Afonso Pereira
600ff9a67b
Translated using Weblate (Portuguese)
...
Currently translated at 69.8% (473 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Afonso Pereira
a5def5cf56
Translated using Weblate (Portuguese)
...
Currently translated at 69.7% (472 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Dr. António
24f7cbf3c9
Translated using Weblate (Portuguese)
...
Currently translated at 69.7% (472 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Afonso Pereira
916d4e0496
Translated using Weblate (Portuguese)
...
Currently translated at 69.4% (470 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
João Rodrigues
1036395dfc
Translated using Weblate (Portuguese)
...
Currently translated at 69.4% (470 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00
Artur Mancha
58528605c8
Translated using Weblate (Portuguese)
...
Currently translated at 56.8% (385 of 677 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
2021-01-25 17:04:16 +00:00