aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2019-01-30Use multiple hackney poolshref
* federation (ap, salmon) * media (rich media, media proxy) * upload (uploader proxy) Each "part" will stop fighting others ones -- a huge federation outbound could before make the media proxy fail to checkout a connection in time. splitted media and uploaded media for the good reason than an upload pool will have all connections to the same host (the uploader upstream). it also has a longer default retention period for connections.
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700
2019-01-28add a job queueEgor Kislitsyn
2019-01-28[#534] Merged `upstream/develop`.Ivan Tashkinov
2019-01-28[#534] Various tweaks. Tests for Instances and Instance.Ivan Tashkinov
2019-01-28Change default bg image in new config.lain
2019-01-25[#534] Configurable outgoing federation reachability timeout.Ivan Tashkinov
2019-01-23New frontend configuration mechanism.lain
2019-01-18Fix merge conflictrinpatch
2019-01-18unfurl_nsfw: false by defaultrinpatch
2019-01-17Also add to default configMark Felder
2019-01-16oopsrinpatch
2019-01-15Introduce get_by_id in Activity, replace newlines with spacesrinpatch
2019-01-13Resolve merge conflictrinpatch
2019-01-10Merge branch 'feature/pinned-posts' into 'develop'kaniini
Pinned Statuses Closes #440 See merge request pleroma/pleroma!636
2019-01-10Alpha sort the restricted nicknamesMark Felder
2019-01-09move defaults from sample_config.exs to config.exsEgor Kislitsyn
2019-01-08Add a setting for users to autofollow on sign up.lain
2019-01-06config/config.exs: Add syslog backendsHaelwenn (lanodan) Monnier
2019-01-03Remove media proxy examples in config/config.exshref
1. this was overriding the real defaults 2. it's documented in `config/config.md`
2019-01-03Merge branch 'captcha' into 'develop'rinpatch
Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585
2019-01-03Merge branch 'fix-chat' into 'develop'rinpatch
Add handler for Phoenix-style socket. See merge request pleroma/pleroma!619
2019-01-02Merge branch 'fix/reserve-media-username' into 'develop'rinpatch
Reserve /media See merge request pleroma/pleroma!620
2019-01-02reserve /mediaRin Toshaka
2019-01-02Add handler for Phoenix-style socket.lain
2019-01-01Make Federator options configurable.lain
2018-12-29Merge branch 'carrot-bullying' into 'develop'kaniini
Add some hard limits on inserted activities. See merge request pleroma/pleroma!595
2018-12-28Raise remote limitlambda
2018-12-27Up captcha timer to 60 secs again, save used captchas in cachexEkaterina Vaartis
2018-12-26Add 'about' to restricted list.lain
And correct pleromaFE config.
2018-12-26Add ~ to the list of restricted names.lain
2018-12-26Add some hard limits on inserted activities.lain
2018-12-25Reserve a few user nameslain
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-23Renamed the thingsKaren Konou
2018-12-22Fix formattingKaren Konou
2018-12-22Implement large thread filterKaren Konou
2018-12-22Specifically disable captcha for automatic tests, it makes them failEkaterina Vaartis
2018-12-21Make captcha (kocaptcha) statelessEkaterina Vaartis
Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed
2018-12-20Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571
2018-12-19Merge branch 'develop' into oembed_providerraeno
2018-12-18Add a way to use the admin api without a user.lain
2018-12-18Move to docsHaelwenn (lanodan) Monnier
2018-12-18Merge branch 'feature/new-user-routes' into 'develop'lambda
Use "~" as a route namespace symbol on FE See merge request pleroma/pleroma!530
2018-12-18Merge branch 'develop' into oembed_providerraeno
2018-12-17Instance/Static runtime plughref
This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.
2018-12-17Merge branch 'captcha' into 'develop'lambda
Captcha See merge request pleroma/pleroma!550
2018-12-17Integration tests for mastodon websockethref
2018-12-17Cowboy handler for Mastodon WebSockethref
2018-12-17minutes->seconds_retained in config.mdvaartis
2018-12-16Change minutes_retained config to seconds_retainedEkaterina Vaartis