aboutsummaryrefslogtreecommitdiff
path: root/config/config.exs
AgeCommit message (Collapse)Author
2020-11-05Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-21Rip out fedsockets from the release branchrinpatch
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13RemoteIp module nameAlexander Strizhakov
2020-10-09Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-06Move hardcoded default configuration into config.exsMark Felder
2020-10-01web push http_client fixAlexander Strizhakov
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
Media preview proxy See merge request pleroma/pleroma!3001
2020-09-18Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
2020-09-17Make WebPushEncryption use Pleroma.HTTP as an HTTP adapterSergey Suprunenko
2020-09-17[#2497] Configurability of :min_content_length (preview proxy). Refactoring, ↵Ivan Tashkinov
documentation, tests.
2020-09-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-14Remove `:managed_config` option.rinpatch
In practice, it was already removed half a year ago, but the description and cheatsheet entries were still there. The migration intentionally does not use ConfigDB.get_by_params, since this will break migration code as soon as we add a new field is added to ConfigDB. Closes #2086
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
# Conflicts: # lib/pleroma/instances/instance.ex
2020-09-10Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-10configurable lifetime for ephemeral activitiesAlexander Strizhakov
2020-09-10schedule activity expiration in ObanAlexander Strizhakov
2020-09-10expire mfa tokens through ObanAlexander Strizhakov
2020-09-10schedule expired oauth tokens deletion with ObanAlexander Strizhakov
2020-09-09Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-08Feed provider only generates a redirect, so always activate it.Mark Felder
Making this configurable is misleading.
2020-09-08Do not make RelMe metadata provider optional.Mark Felder
There's really no sound reason to turn this off anyway.
2020-09-07adapter options unificationAlexander Strizhakov
not needed options deletion
2020-09-07removing Stats worker from Oban cron jobsAlexander Strizhakov
2020-09-05[#2497] Adjusted media proxy preview invalidation. Allowed client-side ↵Ivan Tashkinov
caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. Removed :preview pool in favor of existing :media one. Misc. refactoring.
2020-09-03Increase pool and timeout for preview so it catches slow media pool responsesMark Felder
2020-09-03Fetch preview requests through the MediaProxy. Separate connection options ↵Mark Felder
are not needed. Use a separate pool for preview requests
2020-09-03Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-02Rich media: Add failure trackingrinpatch
2020-09-02improvements and fixes for http requestsAlexander Strizhakov
- fix for gun worker termination in some circumstances - pool for http clients (ex_aws, tzdata) - default pool timeouts for gun - gun retries on gun_down messages - s3 upload timeout if streaming enabled
2020-08-25Switch to imagemagick, only support videosMark Felder
2020-08-25Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-21[#2497] Media preview proxy: added `quality` config setting, adjusted ↵Ivan Tashkinov
width/height defaults.
2020-08-19[#2497] Media preview proxy config refactoring & documentation.Ivan Tashkinov
2020-08-18[#2497] Added video preview proxy. Switched from exexec to Port.Ivan Tashkinov
2020-08-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-08-18Pleroma.Upload: Set default upload name / description based on config.lain
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance ↵Ivan Tashkinov
privacy setting (i.e. restrict on private instances only by default).
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
# Conflicts: # config/config.exs
2020-08-07Merge branch 'develop' into fix/ldap-auth-issuesMark Felder
2020-08-07Make Floki use fast_htmlrinpatch
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-08-06restricted_nicknames: Add names from MastoAPI endpointsAlex Gleason
2020-08-05Define default authenticator in the configMark Felder
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-04Merge branch 'email-blacklist' into 'develop'lain
Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837