summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-23explicitly set reverse proxy upstream to IPv4Alfie Pates
since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to [::0] on some systems fixes #930.
2019-05-23Change the order of preloading when fetching activities for contextrinpatch
2019-05-23fix merge conflictSachin Joshi
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
mrf: add support for filtering users See merge request pleroma/pleroma!1188
2019-05-22Fix credo issuesrinpatch
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191
2019-05-22update documentation for the new MRF features [no-ci]William Pitcock
2019-05-22tests: add tests for banner and avatar removalWilliam Pitcock
2019-05-22mrf: simple policy: add the ability to strip avatars and banners from user ↵William Pitcock
profiles
2019-05-22activitypub: run user objects through MRF filtersWilliam Pitcock
2019-05-22mrf: defang policy modules for filtering user profile objectsWilliam Pitcock
2019-05-22Exclude Answers from fetching by defaultrinpatch
2019-05-22Normalize poll votes to Answer objectsrinpatch
2019-05-22Merge branch 'fix/prune-objects-times-out' into 'develop'rinpatch
Disable timeouts for object pruning query See merge request pleroma/pleroma!1193
2019-05-22Disable timeouts for object pruning queryrinpatch
2019-05-22Merge branch 'issue/699' into 'develop'lambda
[#699] add worker to clean expired oauth tokens See merge request pleroma/pleroma!1184
2019-05-22[#699] add worker to clean expired oauth tokensMaksim
2019-05-22Update CHANGELOG.mdlambda
2019-05-22Merge branch 'feature/object-pruning' into 'develop'lambda
Object pruning See merge request pleroma/pleroma!1181
2019-05-22Mix: Only start sshd when needed, second try.lain
2019-05-22Merge branch 'bring-ecto-back-to-mainline' into 'develop'lambda
Mix: Bring ecto-sql back to mainline. See merge request pleroma/pleroma!1192
2019-05-22Mix: Bring ecto-sql back to mainline.lain
2019-05-22Changelog: Add tip for debian users.lain
2019-05-22Add GIN index on object data->'name'rinpatch
2019-05-22Documentation: Specify PEM format for SSH keys.lain
Otherwise openssh-client 7.9 will generate a different format that can't be used by esshd.
2019-05-22Linting.lain
2019-05-22Mix: Don't start esshd application if we don't need it.lain
2019-05-22Changelog: Add SSH mode.lain
2019-05-22Merge branch 'refactor/keys' into 'develop'lambda
move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186
2019-05-22salmon: fix credoWilliam Pitcock
2019-05-22Merge branch 'bugfix/account_view_source.note' into 'develop'rinpatch
MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189
2019-05-22MastoAPI AccountView: fill source.note with plaintext version of noteHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
2019-05-22Ability to reset avatar, profile banner and backgroudSachin Joshi
2019-05-22Merge branch 'mongooseim-support' into 'develop'kaniini
MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172
2019-05-22Merge branch 'fix/api-fallback' into 'develop'kaniini
Do not fallback to index.html for /api/* routes Closes #920 See merge request pleroma/pleroma!1182
2019-05-22Merge branch 'bugfix/dm-being-truncated' into 'develop'kaniini
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true Closes #904 See merge request pleroma/pleroma!1185
2019-05-22Do not truncate DM when it contains newlines and safe_dm_mentions is set to trueSergey Suprunenko
2019-05-22move key generation functions into Pleroma.Keys moduleWilliam Pitcock
2019-05-22prune objects task: use Repo.delete_all()William Pitcock
2019-05-22Fix failing testAaron Tinio
2019-05-22Respond with a 404 Not implemented JSON error messageAaron Tinio
when requested API is not implemented
2019-05-22Add tests for fallback routesAaron Tinio
2019-05-21add changelog entry for object pruningWilliam Pitcock
2019-05-21add mix task to prune the object database using a configured retention periodWilliam Pitcock
2019-05-21object: fetcher: add support for reinjecting pruned objectsWilliam Pitcock
2019-05-21object: add Object.prune()William Pitcock
2019-05-21MastoAPI: Add GET /api/v1/polls/:idrinpatch
2019-05-21MongooseIM: Add documentation.lain
2019-05-21Accept question objects for conversationsrinpatch
2019-05-21Accept strings in expires_in because sasuga javascriptrinpatch