Commit graph

4248 commits

Author SHA1 Message Date
eugenijm
f06ec18cd7 Chat fixes 2020-05-29 09:43:52 +03:00
eugenijm
804cf3abc5 WIP: Chats 2020-05-29 09:43:52 +03:00
HJ
f288178b67 Merge branch 'fix/sidebarRight_option' into 'develop'
The sidebarRight option wasn't being read

Closes #858

See merge request pleroma/pleroma-fe!1125
2020-05-28 17:36:05 +00:00
Mark Felder
5f41ee8864 The sidebarRight option wasn't being read 2020-05-28 12:28:32 -05:00
HJ
cf3fbdd610 Merge branch 'fix/favorites-timeline-unsupported-with-muted' into 'develop'
Removed `with_muted` param usage for user favorites timeline endpoint

See merge request pleroma/pleroma-fe!1119
2020-05-25 10:48:45 +00:00
Ivan Tashkinov
5235e7ea1e Removed with_muted param usage for user favorites timeline endpoint (it only supports pagination params). 2020-05-25 08:48:44 +03:00
HJ
1ae8935977 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma-fe!1115
2020-05-22 14:52:31 +00:00
Ben Is
306ed13087 Translated using Weblate (Italian)
Currently translated at 42.2% (259 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-05-20 17:26:11 +00:00
Master Sparker
e300f08e09 Translated using Weblate (Chinese (Simplified))
Currently translated at 92.0% (564 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2020-05-20 17:26:11 +00:00
rinpatch
866fe78bba Translated using Weblate (Russian)
Currently translated at 61.1% (375 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
2020-05-20 17:26:11 +00:00
Jędrzej Tomaszewski
0a2aeb5d1a Translated using Weblate (Polish)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2020-05-20 17:26:11 +00:00
Fristi
b4f8d91905 Translated using Weblate (Dutch)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-05-20 17:26:11 +00:00
Anonymous
7f9eb23759 Translated using Weblate (German)
Currently translated at 75.2% (461 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
1478ff7fc7 Translated using Weblate (German)
Currently translated at 75.2% (461 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
91da315af9 Translated using Weblate (German)
Currently translated at 74.0% (454 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
9ede7db8df Translated using Weblate (German)
Currently translated at 74.0% (454 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
3e260661d0 Translated using Weblate (German)
Currently translated at 73.0% (448 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
53b2ae0f73 Translated using Weblate (German)
Currently translated at 73.0% (448 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
c8cf939cdd Translated using Weblate (German)
Currently translated at 71.4% (438 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
9202eeef4b Translated using Weblate (German)
Currently translated at 71.4% (438 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
495b3d819c Translated using Weblate (German)
Currently translated at 71.2% (437 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
c1834b3156 Translated using Weblate (German)
Currently translated at 71.2% (437 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
7bd0f1a5f1 Translated using Weblate (German)
Currently translated at 70.3% (431 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
f141fa2a66 Translated using Weblate (German)
Currently translated at 70.3% (431 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
e7fd793438 Translated using Weblate (German)
Currently translated at 69.0% (423 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
9e43a83c48 Translated using Weblate (German)
Currently translated at 69.0% (423 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
1179a6687a Translated using Weblate (German)
Currently translated at 68.8% (422 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
f91bb4dc7c Translated using Weblate (German)
Currently translated at 68.8% (422 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
f22d3c18cf Translated using Weblate (German)
Currently translated at 68.6% (421 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
14ac5a5fdb Translated using Weblate (German)
Currently translated at 68.6% (421 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
9374002de0 Translated using Weblate (German)
Currently translated at 68.5% (420 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
ab4790034b Translated using Weblate (German)
Currently translated at 68.5% (420 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Toromino
9e306efe2e Translated using Weblate (German)
Currently translated at 68.3% (419 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Anonymous
b994bde3e2 Translated using Weblate (German)
Currently translated at 68.3% (419 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2020-05-20 17:26:11 +00:00
Ben Is
00b4b1f4f6 Translated using Weblate (Italian)
Currently translated at 40.6% (249 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-05-20 17:26:11 +00:00
Fristi
a62d504fab Translated using Weblate (Dutch)
Currently translated at 78.1% (479 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-05-20 17:26:11 +00:00
Ben Is
7f7919bf6f Translated using Weblate (Italian)
Currently translated at 36.2% (222 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-05-20 17:26:11 +00:00
Fristi
3cd6bc9cfb Translated using Weblate (Dutch)
Currently translated at 77.9% (478 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-05-20 17:26:11 +00:00
feld
24901ed98f Merge branch 'chore/update-docs' into 'develop'
Document the sidebarRight feature

See merge request pleroma/pleroma-fe!1117
2020-05-20 17:26:04 +00:00
Mark Felder
4aaa3f87d8 Document the sidebarRight feature 2020-05-20 12:16:43 -05:00
Shpuld Shpludson
a8e9c05f09 Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
Shpuld Shpludson
0b44a5b601 Merge branch 'fix/its-me-elements' into 'develop'
Show "it's you" label and hide follow btn for current user

Closes #839 and #827

See merge request pleroma/pleroma-fe!1111
2020-05-20 14:48:52 +00:00
Shpuld Shpludson
d53a4a754f Merge branch 'chore/remote-unused-option' into 'develop'
Remove unused noAttachmentLinks option

See merge request pleroma/pleroma-fe!1109
2020-05-20 14:42:29 +00:00
lain
bc9ed36424 Merge branch 'feat/add-embed-relationships' into 'develop'
Add `with_relationships` query param

Closes #838

See merge request pleroma/pleroma-fe!1107
2020-05-17 07:27:07 +00:00
Mark Felder
2135dc8510 Merge branch 'develop' into feat/sidebar-alignment 2020-05-15 12:26:38 -05:00
rinpatch
671ecfb152 Merge branch 'resolve-weblate-merge-conflicts' into 'develop'
Resolve weblate merge conflicts

See merge request pleroma/pleroma-fe!1114
2020-05-15 05:02:47 +00:00
rinpatch
ca52a7321d Merge remote-tracking branch 'weblate/develop' into resolve-weblate-merge-conflicts 2020-05-14 22:53:08 +03:00
Anonymous
8db7cba9e1 Translated using Weblate (English)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-05-14 18:13:04 +00:00
Ben Is
7a0f27f3b0 Translated using Weblate (Italian)
Currently translated at 35.0% (215 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-05-14 18:13:03 +00:00
Fristi
9c62b90212 Translated using Weblate (Dutch)
Currently translated at 77.8% (477 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-05-14 18:13:00 +00:00