aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-06-25added wrapper Pleroma.HTTP for ExAws.S3Maksim Pechnikov
2020-06-24fixed config/descpiption.exsMaksim Pechnikov
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
2020-06-23Remove reference to defunct distsn.orgMark Felder
2020-06-23migrate to oban 2.0-rc1Maksim Pechnikov
2020-06-22Add missing default config value for :instance, instance_thumbnailMark Felder
Follows up on b7fc61e17b
2020-06-17Merge branch 'develop' into issue/1855Mark Felder
2020-06-16moving mrf settings from instance to separate groupAlexander Strizhakov
2020-06-16Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIMEhref
2020-06-16Pleroma.MIME: use gen_magichref
2020-06-15Merge branch 'develop' into issue/1855Maksim Pechnikov
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-14fix invalidates media url'sMaksim Pechnikov
2020-06-13Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-12Merge branch 'develop' into preload-dataMark Felder
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-12Apply suggestion to config/description.exslain
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-08Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-06-03fix configstwf
2020-06-03Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-datastwf
# Conflicts: # lib/pleroma/web/preload/status_net.ex
2020-06-03clean upstwf
2020-06-03add status_net/configstwf
2020-06-03preload data into index.htmlstwf
2020-06-03add status_net/configstwf
2020-06-02Merge branch 'tagline' into 'develop'lain
Update default instance description See merge request pleroma/pleroma!2600
2020-06-01Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-06-01Config: Default to Hackney againlain
Gun needs some server setting changes (files) and has problems with OTP 23 (wildcards), so use Hackney as a default again for now.
2020-05-29preload data into index.htmlstwf
2020-05-28Update default instance descriptionAlex Gleason
2020-05-26Config: Restore old new background imagelain
Became lost in a settings restructure
2020-05-22Update CHANGELOG and docsRoman Chvanikov
2020-05-22Add filename_display_max_length configRoman Chvanikov
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