aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2019-06-04Fix testsRoman Chvanikov
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
2019-06-03add option skip_thread_containmentMaksim Pechnikov
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-02Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit ↵Ivan Tashkinov
dependency specification.
2019-06-02formattingWilliam Pitcock
2019-06-02mrf: add subchain policyWilliam Pitcock
2019-06-01Resolve merge conflictsrinpatch
2019-05-31Merge branch 'dokku' into 'develop'Haelwenn
Dokku CI support - On-Demand review instances See merge request pleroma/pleroma!1216
2019-05-31CI: Add auto-deployment via dokku.lain
2019-05-29Merge developRoman Chvanikov
2019-05-25remove @websub and @ostatus module-level constantsWilliam Pitcock
2019-05-25tests: websub: check only that signature validation succeeds or failsWilliam Pitcock
2019-05-25kill @httpoisonWilliam Pitcock
2019-05-22mrf: simple policy: add the ability to strip avatars and banners from user ↵William Pitcock
profiles
2019-05-22[#699] add worker to clean expired oauth tokensMaksim
2019-05-22Merge branch 'feature/object-pruning' into 'develop'lambda
Object pruning See merge request pleroma/pleroma!1181
2019-05-22Merge branch 'mongooseim-support' into 'develop'kaniini
MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172
2019-05-21add mix task to prune the object database using a configured retention periodWilliam Pitcock
2019-05-21Add poll limits to /api/v1/instance and initial staterinpatch
2019-05-20Additional reserved usernamesMark Felder
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-20Add report filtering to MRF.SimplePolicyAaron Tinio
2019-05-17config: make sending the user agent configurable, disable sending the user ↵William Pitcock
agent in tests
2019-05-17RUM: Set rum status by the environment.lain
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-indexlain
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
ecto_sql_update
2019-05-17Configuration: disable migration lock.lain
2019-05-16add report uri and report toAlex S
2019-05-15Merge branch 'chore/extricate-http-signatures' into 'develop'lambda
switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155
2019-05-15Merge branch 'cleanup' into 'develop'lambda
Remove unused queue from the config See merge request pleroma/pleroma!1158
2019-05-15Search: Add optional rum indexing / searching.lain
2019-05-15Merge branch 'legacy-fe-config' into 'develop'rinpatch
remove deprecated PleromaFE configuration See merge request pleroma/pleroma!1152
2019-05-15remove deprecated PleromaFE configurationSachin Joshi
2019-05-15Remove unused queue from the configEgor Kislitsyn
2019-05-14Fix rate-limiting testsrinpatch
2019-05-14switch to pleroma/http_signatures libraryWilliam Pitcock
2019-05-14Make rate limiting for Mastodon Registration API less agressive and enable ↵rinpatch
it by default. As discussed on irc. Unlike Mastodon our web interface for registrations is using the same APIs regular apps would be using, so 5 requests per 30 minutes per IP could hurt valid use-cases when Pleroma-FE switches to it. Also enable the endpoint by default, it makes no sense to have it disabled when 1. TwitterAPI endpoint is there and always enabled 2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there) Also in this commit: minor changelog improvements.
2019-05-14Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-13Merge branch 'feature/federator-behaviours' into 'develop'lambda
federator modularization (outgoing) See merge request pleroma/pleroma!1140
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-12websub: adapt to work as a federator publishing moduleWilliam Pitcock
2019-05-12salmon: refactor to work as a federator publishing moduleWilliam Pitcock
2019-05-12federator: publisher: add publish() wrapperWilliam Pitcock
2019-05-08Merge developRoman Chvanikov
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-07unused config paramaterAlex S
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 07:54:55 +0000