sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-25 02:05:50 +01:00
Code Issues Releases Wiki Activity
5,266 Commits 159 Branches 3 Tags 444 MiB
b4580d086f
Commit Graph

5266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shpuld Shpuldson
b4580d086f Merge branch 'develop' into feat/reason-in-registration 2021-02-15 11:10:38 +02:00
Shpuld Shpuldson
a636e53404 add reason field when approval is required 2021-02-15 11:10:09 +02:00
HJ
2f8d4c7406 Merge branch 'fix/weblate-conflicts' into 'develop' 
Merge Weblate updates

See merge request pleroma/pleroma-fe!1346
 2021-02-15 08:33:58 +00:00
rinpatch
3d25946bbf Merge Weblate updates 
There was a merge conflict so it had to be done manually.
 2021-02-15 11:25:03 +03: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
Ryo Ueno
7e11093fcd Translated using Weblate (Japanese) 
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/
 2021-02-14 09:49:18 +00:00
Ben Is
cba48476ad Translated using Weblate (Italian) 
Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-02-14 09:49:16 +00:00
rinpatch
033b7eaeb9 Translated using Weblate (Russian) 
Currently translated at 83.6% (573 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
 2021-02-13 22:05:02 +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
Ben Is
376d431681 Translated using Weblate (Italian) 
Currently translated at 100.0% (682 of 682 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-02-12 19:15:48 +00:00
Ryo Ueno
0dc6937bf8 Translated using Weblate (Korean) 
Currently translated at 57.3% (390 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
 2021-02-12 19:15:48 +00:00
Anonymous
a848462f19 Translated using Weblate (Japanese) 
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/
 2021-02-12 19:15:48 +00:00
Ryo Ueno
cccdda3a7b Translated using Weblate (Japanese) 
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/
 2021-02-12 19:15:48 +00:00
Anonymous
e85fa160c7 Translated using Weblate (Japanese) 
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/
 2021-02-12 19:15:48 +00:00
Ryo Ueno
586c538aa0 Translated using Weblate (Japanese) 
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/
 2021-02-12 19:15:48 +00:00
tarteka
21e2b3ce0e Translated using Weblate (Spanish) 
Currently translated at 100.0% (680 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
 2021-02-12 19:15:48 +00:00
Ben Is
11081c2870 Translated using Weblate (Italian) 
Currently translated at 100.0% (680 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-02-12 19:15:48 +00:00
Snow
4c845a1a99 Translated using Weblate (Chinese (Traditional)) 
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/
 2021-02-12 19:15:48 +00:00
Snow
0a3f40eebb Translated using Weblate (Chinese (Traditional)) 
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/
 2021-02-12 19:15:48 +00:00
Snow
63317a2fdf Translated using Weblate (Chinese (Traditional)) 
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/
 2021-02-12 19:15:48 +00:00
LibertAdmin
0ffb7b67ed Translated using Weblate (French) 
Currently translated at 98.2% (667 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
 2021-02-12 19:15:48 +00:00
fiftyffs
1a836c8527 Translated using Weblate (Norwegian Bokmål) 
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/
 2021-02-12 19:15:48 +00: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