Commit Graph

147 Commits (a19f8778afddb7f504b08cedde752e37da52dc96)

Author SHA1 Message Date
lain 1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop'
4 years ago
lain f585622f85 Apply suggestion to config/description.exs
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Mark Felder 54039100fe Remove reference to defunct distsn.org
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain 4655407451 Apply suggestion to config/description.exs
4 years ago
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
Roman Chvanikov 8eb1dfadca Update CHANGELOG and docs
4 years ago
eugenijm b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Mark Felder 4c48626585 Also add new sidebarRight setting
4 years ago
lain 64b3d81e50 Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
4 years ago
Angelina Filippova 4a925b964a Remove description of the settings that should't be altered
4 years ago
Mark Felder 54b4824186 Lint
4 years ago
Mark Felder 6f53d8815e Clarify where the Features panel is
4 years ago
Mark Felder 2560a4aa56 Formatting
4 years ago
Mark Felder 0c82a967ec Add missing showFeaturesPanel setting
4 years ago
Mark Felder 5131149056 add postContentType setting
4 years ago
Mark Felder 52a95a0265 Add missing nsfwCensorImage option
4 years ago
Mark Felder 923ab78807 Add missing hideSitename setting
4 years ago
Mark Felder c86cdb76a7 Add hideFilteredStatuses and hideMutedPosts settings
4 years ago
Mark Felder 7f00698c3b Add greentext option
4 years ago
Mark Felder 38fb5eaf6a formattingOptionsEnabled no longer exists
4 years ago
Mark Felder 4bdde143f9 Add disableChat option
4 years ago
Mark Felder 2420d7f439 Spelling/grammar
4 years ago
Mark Felder 4aad764c1d enableEmojiPicker is not a setting
4 years ago
Mark Felder 2e28b50132 scopeOptionsEnabled has been replaced with minimalScopesMode
4 years ago
Mark Felder e2c80e62f1 Stickers setting does not exist
4 years ago
Mark Felder 1e48aee50e Alpha sort FE config descriptions
4 years ago
Mark Felder 1b93581162 Synchronize suggestions with all available static/config.json settings
4 years ago
Alexander Strizhakov da6a38d205
copy/paste fix for descriptions
4 years ago
lain 7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop'
4 years ago
Mark Felder c9344b5f2d Minor grammar nit
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
rinpatch 5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
4 years ago
Egor Kislitsyn cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
4 years ago
Egor Kislitsyn decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
feld b1c29e2de8 Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
4 years ago
Angelina Filippova 2ab52d5224 Fix inconsistency in language for activating settings
4 years ago
Ivan Tashkinov 92efb888c7 Made follow request notifications non-optional (removed config switch).
4 years ago
Alexander Strizhakov 66acfa6882
descriptions that module names are shortened
4 years ago
Egor Kislitsyn c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
Egor Kislitsyn 364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago