Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
2020-05-22 18:30:13 +03:00
eugenijm
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
2020-05-21 04:41:42 +03:00
Mark Felder
4c48626585
Also add new sidebarRight setting
2020-05-20 12:22:31 -05:00
lain
64b3d81e50
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
...
Remove settings that shouldn't be altered
Closes admin-fe#110
See merge request pleroma/pleroma!2540
2020-05-17 07:48:52 +00:00
Angelina Filippova
4a925b964a
Remove description of the settings that should't be altered
2020-05-16 20:39:42 +03:00
Mark Felder
54b4824186
Lint
2020-05-13 17:07:14 -05:00
Mark Felder
6f53d8815e
Clarify where the Features panel is
2020-05-13 16:57:33 -05:00
Mark Felder
2560a4aa56
Formatting
2020-05-13 16:51:23 -05:00
Mark Felder
0c82a967ec
Add missing showFeaturesPanel setting
2020-05-13 16:49:56 -05:00
Mark Felder
5131149056
add postContentType setting
2020-05-13 16:45:16 -05:00
Mark Felder
52a95a0265
Add missing nsfwCensorImage option
2020-05-13 16:40:04 -05:00
Mark Felder
923ab78807
Add missing hideSitename setting
2020-05-13 16:36:33 -05:00
Mark Felder
c86cdb76a7
Add hideFilteredStatuses and hideMutedPosts settings
2020-05-13 16:35:12 -05:00
Mark Felder
7f00698c3b
Add greentext option
2020-05-13 16:32:38 -05:00
Mark Felder
38fb5eaf6a
formattingOptionsEnabled no longer exists
2020-05-13 16:31:15 -05:00
Mark Felder
4bdde143f9
Add disableChat option
2020-05-13 16:30:24 -05:00
Mark Felder
2420d7f439
Spelling/grammar
2020-05-13 16:26:49 -05:00
Mark Felder
4aad764c1d
enableEmojiPicker is not a setting
2020-05-13 16:24:37 -05:00
Mark Felder
2e28b50132
scopeOptionsEnabled has been replaced with minimalScopesMode
2020-05-13 16:23:42 -05:00
Mark Felder
e2c80e62f1
Stickers setting does not exist
2020-05-13 16:19:17 -05:00
Mark Felder
1e48aee50e
Alpha sort FE config descriptions
2020-05-13 16:18:26 -05:00
Mark Felder
1b93581162
Synchronize suggestions with all available static/config.json settings
2020-05-13 16:03:42 -05:00
Alexander Strizhakov
da6a38d205
copy/paste fix for descriptions
2020-05-11 09:35:20 +03:00
lain
7ca83e71a9
Merge branch 'shortening-modules-name' into 'develop'
...
Descriptions that module names are shortened
See merge request pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
Mark Felder
c9344b5f2d
Minor grammar nit
2020-05-08 14:36:59 -05:00
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
rinpatch
5482a1f6ef
Merge branch 'openapi/validation-plug' into 'develop'
...
Ignore unexpected query params and ENUM values
Closes #1719
See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
2020-05-05 15:01:33 +04:00
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
feld
b1c29e2de8
Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
...
Fix inconsistency in language for activating settings in description.exs
Closes admin-fe#108
See merge request pleroma/pleroma!2469
2020-05-04 20:24:08 +00:00
Angelina Filippova
2ab52d5224
Fix inconsistency in language for activating settings
2020-05-04 22:41:14 +03:00
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
Alexander Strizhakov
66acfa6882
descriptions that module names are shortened
2020-04-27 10:28:05 +03:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Alexander Strizhakov
ba90a6d3e5
removing from descriptions.exs deprecated settings
2020-03-16 14:01:35 +03:00
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00