aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-05-21[#2497] Customized `exexec` launch to support root operation (currently ↵Ivan Tashkinov
required by Gitlab CI).
2020-05-21Added the ability to upload background, logo, default user avatar, instance ↵eugenijm
thumbnail, and the NSFW hiding image via AdminFE
2020-05-20Merge branch 'chore/update-config-fe' into 'develop'Haelwenn
Synchronize :fe settings in config.exs See merge request pleroma/pleroma!2560
2020-05-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-05-20[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp ↵Ivan Tashkinov
& mogrify-based resizing.
2020-05-20Also add new sidebarRight settingMark Felder
2020-05-20Merge branch 'exposed-background-image' into 'develop'Haelwenn
InstanceView: Expose background image link. See merge request pleroma/pleroma!2545
2020-05-20Merge branch 'issue/1509' into 'develop'lain
[#1509] purge media from cache after delete See merge request pleroma/pleroma!2539
2020-05-19Synchronize :fe settings in config.exsMark Felder
2020-05-18InstanceView: Expose background image link.lain
This will make it easier for more clients to support this feature.
2020-05-18updated docsMaksim Pechnikov
2020-05-17Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'lain
Remove settings that shouldn't be altered Closes admin-fe#110 See merge request pleroma/pleroma!2540
2020-05-17Merge branch 'restricted-relations-embedding' into 'develop'lain
Restricted support for embedded relationships See merge request pleroma/pleroma!2456
2020-05-17added example cache purge scriptMaksim Pechnikov
2020-05-16Remove description of the settings that should't be alteredAngelina Filippova
2020-05-16Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-05-15added media proxy invalidationMaksim Pechnikov
2020-05-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-05-14[#2497] Added support for :eimp for image resizing.Ivan Tashkinov
2020-05-13LintMark Felder
2020-05-13Clarify where the Features panel isMark Felder
2020-05-13FormattingMark Felder
2020-05-13Add missing showFeaturesPanel settingMark Felder
2020-05-13add postContentType settingMark Felder
2020-05-13Add missing nsfwCensorImage optionMark Felder
2020-05-13Add missing hideSitename settingMark Felder
2020-05-13Add hideFilteredStatuses and hideMutedPosts settingsMark Felder
2020-05-13Add greentext optionMark Felder
2020-05-13formattingOptionsEnabled no longer existsMark Felder
2020-05-13Add disableChat optionMark Felder
2020-05-13Spelling/grammarMark Felder
2020-05-13enableEmojiPicker is not a settingMark Felder
2020-05-13scopeOptionsEnabled has been replaced with minimalScopesModeMark Felder
2020-05-13Stickers setting does not existMark Felder
2020-05-13Alpha sort FE config descriptionsMark Felder
2020-05-13Synchronize suggestions with all available static/config.json settingsMark Felder
2020-05-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs
2020-05-11[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests ↵Ivan Tashkinov
adjustments.
2020-05-11copy/paste fix for descriptionsAlexander Strizhakov
2020-05-10Merge branch 'shortening-modules-name' into 'develop'lain
Descriptions that module names are shortened See merge request pleroma/pleroma!2428
2020-05-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-08Initial implementation of image preview proxy. Media proxy tests refactoring.Ivan Tashkinov
2020-05-08Minor grammar nitMark Felder
2020-05-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-05Merge branch 'openapi/validation-plug' into 'develop'rinpatch
Ignore unexpected query params and ENUM values Closes #1719 See merge request pleroma/pleroma!2468
2020-05-05Document configuration for Pleroma.Web.ApiSpec.CastAndValidateEgor Kislitsyn
2020-05-05Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-05-04Merge branch 'feature/update-labels-for-activating-settings' into 'develop'feld
Fix inconsistency in language for activating settings in description.exs Closes admin-fe#108 See merge request pleroma/pleroma!2469
2020-05-04Fix inconsistency in language for activating settingsAngelina Filippova