aboutsummaryrefslogtreecommitdiff
path: root/config/config.exs
AgeCommit message (Collapse)Author
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-14fix invalidates media url'sMaksim Pechnikov
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-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-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-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-17added example cache purge scriptMaksim Pechnikov
2020-05-15added media proxy invalidationMaksim Pechnikov
2020-05-14[#2497] Added support for :eimp for image resizing.Ivan Tashkinov
2020-05-11[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests ↵Ivan Tashkinov
adjustments.
2020-05-08Initial implementation of image preview proxy. Media proxy tests refactoring.Ivan Tashkinov
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 'develop' into global-status-expirationEgor Kislitsyn
2020-05-04Add a config option to enable strict validationEgor Kislitsyn
2020-05-01Restricted embedding of relationships where applicable (statuses / ↵Ivan Tashkinov
notifications / accounts rendering). Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.
2020-05-01Made follow request notifications non-optional (removed config switch).Ivan Tashkinov
2020-04-24Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-20Merge remote-tracking branch 'upstream/develop' into accept-deletesAlex Gleason
2020-04-20Add :reject_deletes option to SimplePolicyAlex Gleason
2020-04-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1559-follow-request-notifications # Conflicts: # CHANGELOG.md
2020-04-10Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-07[#1559] Support for "follow_request" notifications (configurable).Ivan Tashkinov
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses # Conflicts: # CHANGELOG.md