Mark Felder
|
840c6f40b6
|
Merge branch 'develop' into chore/remote-unused-option
|
2020-05-14 12:22:28 -05: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 |
|
|
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 |
|
Egor
|
26bcfea727
|
Translated using Weblate (Russian)
Currently translated at 53.8% (330 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
|
2020-05-12 15:52:53 +00:00 |
|
Haelwenn (lanodan) Monnier
|
c412856716
|
Translated using Weblate (French)
Currently translated at 97.3% (597 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: http://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
|
2020-05-12 08:31:01 +00:00 |
|
Shpuld Shpuldson
|
7a0e554daf
|
update changelog
|
2020-05-08 13:25:18 +03:00 |
|
Shpuld Shpludson
|
47c56ffa1c
|
Merge branch 'feat/relationship-refactor' into 'develop'
Refactor: make relationships separate from users
Closes #819
See merge request pleroma/pleroma-fe!1091
|
2020-05-08 09:14:26 +00:00 |
|
Shpuld Shpludson
|
1186205583
|
Merge branch 'develop' into 'feat/relationship-refactor'
# Conflicts:
# src/components/notification/notification.js
|
2020-05-08 08:35:30 +00:00 |
|
Shpuld Shpludson
|
921eedfd84
|
Merge branch 'feat/status-content-separation' into 'develop'
Refactor: Separate status content from status
See merge request pleroma/pleroma-fe!1092
|
2020-05-08 08:33:55 +00:00 |
|
Shpuld Shpludson
|
ec7bee6bd6
|
Merge branch 'feature/copy-link' into 'develop'
Copy status link to clipboard
See merge request pleroma/pleroma-fe!1085
|
2020-05-08 08:33:20 +00:00 |
|
Shpuld Shpludson
|
f4676e17d3
|
Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
# static/fontello.json
|
2020-05-08 08:20:03 +00:00 |
|
Shpuld Shpuldson
|
ddc3b86d24
|
fix popover not closing on pressing the buttons
|
2020-05-08 10:46:00 +03:00 |
|
Mark Felder
|
41fc26869f
|
Correctly resolve the URI of the server
|
2020-05-07 16:33:21 -05:00 |
|
Shpuld Shpuldson
|
93baa8b664
|
fix gap when not logged in
|
2020-05-08 00:10:49 +03:00 |
|
Shpuld Shpludson
|
f40de85b92
|
Merge branch 'fix/signup-without-email' into 'develop'
Permit signup without email
See merge request pleroma/pleroma-fe!1072
|
2020-05-07 21:04:59 +00:00 |
|
Shpuld Shpludson
|
2893834095
|
Merge branch 'feat/notification-privacy' into 'develop'
Add notification privacy option to user settings
See merge request pleroma/pleroma-fe!1100
|
2020-05-07 20:34:27 +00:00 |
|
Mark Felder
|
b3003d4e8d
|
Add notification privacy option to user settings
|
2020-05-06 11:46:40 -05:00 |
|
Shpuld Shpuldson
|
f7f8a579fa
|
make email validation conditional work
|
2020-05-04 12:56:39 +03:00 |
|
Shpuld Shpuldson
|
101eebb40b
|
Merge branch 'develop' into fix/signup-without-email
|
2020-05-04 11:05:05 +03:00 |
|
Shpuld Shpludson
|
9b349b4019
|
Merge branch 'rc/2.0.3' into 'develop'
update MASTER for 2.0.3
See merge request pleroma/pleroma-fe!1098
|
2020-05-02 13:43:22 +00:00 |
|
Shpuld Shpludson
|
2618c1b702
|
Update CHANGELOG.md
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpuldson
|
b095d2e17e
|
don't dismiss a rejected follow request on server
|
2020-05-02 16:21:46 +03:00 |
|