sadposter
|
b4ca079bdb
|
dd nsfw
|
2020-05-20 17:15:34 +01: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 |
|
HJ
|
2eea36f623
|
Merge branch 'i18n/update-delete-description' into 'develop'
Clarify that we only delete data, not the account
See merge request pleroma/pleroma-fe!1102
|
2020-05-14 18:12:53 +00:00 |
|
Mark Felder
|
840c6f40b6
|
Merge branch 'develop' into chore/remote-unused-option
|
2020-05-14 12:22:28 -05:00 |
|
Fristi
|
f2bcaec8dc
|
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 16:48:25 +00:00 |
|
Fristi
|
9d2935e72f
|
Translated using Weblate (Dutch)
Currently translated at 77.6% (476 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
|
2020-05-14 11:06:22 +00:00 |
|
Sergey Suprunenko
|
db8dd1223c
|
Make a condition clear and unambiguous
|
2020-05-14 09:27:58 +02:00 |
|
Sergey Suprunenko
|
e50857d0ff
|
Show "it's you" label and hide follow btn for current user
|
2020-05-14 09:25:07 +02:00 |
|
HJ
|
dbf9285ed7
|
Merge branch 'chore/update-config-docs' into 'develop'
Update settings documentation and sample static/config.json
See merge request pleroma/pleroma-fe!1110
|
2020-05-13 22:31:48 +00:00 |
|
Mark Felder
|
229bf79d90
|
name setting should be with apiConfig section
|
2020-05-13 17:20:35 -05:00 |
|
Mark Felder
|
79c53b849e
|
registrationOpen is not an FE setting
|
2020-05-13 16:46:58 -05:00 |
|
Mark Felder
|
03318b64aa
|
Really alpha sort this
|
2020-05-13 15:48:21 -05:00 |
|
Mark Felder
|
17b65e06be
|
Merge branch 'develop' into chore/update-config-docs
|
2020-05-13 15:43:26 -05:00 |
|
Mark Felder
|
e80fa3ff6d
|
Split apiConfig options from static/config.json options;
Move safeDM to nasty section, alpha sort things
|
2020-05-13 15:40:13 -05:00 |
|
Mark Felder
|
d91f5189ef
|
Config setting is actually called disableChat
|
2020-05-13 15:33:01 -05:00 |
|
Shpuld Shpludson
|
cc9dd28e6b
|
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma-fe!1108
|
2020-05-13 20:32:10 +00:00 |
|
Mark Felder
|
0ebf1bebb4
|
SafeDM is enabled by default and won't take effect if BE not enabled anyway.
|
2020-05-13 15:32:02 -05:00 |
|
Mark Felder
|
55fe6e4703
|
Alpha sort indirect section
|
2020-05-13 15:30:54 -05:00 |
|
Mark Felder
|
cad40133d2
|
Alpha sort docs, add missing options
|
2020-05-13 15:29:38 -05:00 |
|
rinpatch
|
346f3a285a
|
Translated using Weblate (Russian)
Currently translated at 61.0% (374 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-13 20:08:00 +00:00 |
|
Ben Is
|
1f53f0a844
|
Translated using Weblate (Italian)
Currently translated at 28.3% (174 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
|
2020-05-13 20:07:59 +00:00 |
|
Shpuld Shpuldson
|
fc12f44f7a
|
Translated using Weblate (Finnish)
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
|
2020-05-13 20:07:58 +00:00 |
|
Mark Felder
|
0ef5965b3b
|
Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename
|
2020-05-13 14:52:48 -05:00 |
|
Mark Felder
|
1db2fc3f41
|
alpha sort
|
2020-05-13 14:52:21 -05:00 |
|
Mark Felder
|
62e0fda597
|
loginMethod was missing
|
2020-05-13 14:46:31 -05:00 |
|
Mark Felder
|
a4a25105ba
|
Separate the user configurable section
|
2020-05-13 14:43:36 -05:00 |
|
Mark Felder
|
98d332793c
|
alpha sort
|
2020-05-13 14:40:46 -05:00 |
|
Mark Felder
|
eea6d772ad
|
Also remove from docs
|
2020-05-13 14:31:00 -05:00 |
|
Mark Felder
|
c2bba3f5ad
|
Remove unused noAttachmentLinks option
|
2020-05-13 14:28:35 -05:00 |
|
Michał Sidor
|
bc215d70f5
|
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-13 18:41:14 +00:00 |
|
rinpatch
|
8ac78e92f8
|
Translated using Weblate (Russian)
Currently translated at 59.3% (364 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-13 18:41:13 +00:00 |
|
Ben Is
|
21ecca4c62
|
Translated using Weblate (Italian)
Currently translated at 28.3% (174 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
|
2020-05-13 18:41:11 +00:00 |
|
Toro Mino
|
a26731de30
|
Translated using Weblate (German)
Currently translated at 66.7% (409 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
|
2020-05-13 18:41:10 +00:00 |
|
Shpuld Shpuldson
|
c360a23845
|
Translated using Weblate (Finnish)
Currently translated at 78.7% (483 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
|
2020-05-13 18:41:07 +00:00 |
|
Anonymous
|
433d64827d
|
Translated using Weblate (Italian)
Currently translated at 27.5% (169 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
|
2020-05-13 17:41:40 +00:00 |
|
rinpatch
|
625d9b7320
|
Translated using Weblate (Russian)
Currently translated at 54.4% (334 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-13 17:17:13 +00:00 |
|
hj
|
1a944efa33
|
Translated using Weblate (Russian)
Currently translated at 54.4% (334 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-13 17:17:12 +00:00 |
|
Alibek Omarov
|
fa403bbcbd
|
Translated using Weblate (Russian)
Currently translated at 54.4% (334 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-13 17:17:11 +00:00 |
|
Shpuld Shpuldson
|
9c7cb3a954
|
remove search1 with_relationships
|
2020-05-13 18:04:30 +03:00 |
|
Shpuld Shpuldson
|
355281081a
|
don't send undefined
|
2020-05-13 17:53:43 +03:00 |
|
Shpuld Shpuldson
|
8e39971098
|
add with_relationships where necessary
|
2020-05-13 17:48:31 +03:00 |
|