summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-22Merge branch 'feature/object-pruning' into 'develop'lambda
Object pruning See merge request pleroma/pleroma!1181
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-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-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-21MongooseIM: Add documentation.lain
2019-05-21Merge branch 'trivial/increase-hackney-timeouts' into 'develop'kaniini
http: bump connection timeout to 10 seconds See merge request pleroma/pleroma!1183
2019-05-21http: bump connection timeout to 10 secondsWilliam Pitcock
2019-05-21Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'kaniini
Fix prometheus-ecto error when not configured Closes #917 See merge request pleroma/pleroma!1180
2019-05-20Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'kaniini
Add virtual :thread_muted? field Closes #901 See merge request pleroma/pleroma!1178
2019-05-21Fix prometheus-ecto error when not configuredAaron Tinio
2019-05-20Additional reserved usernamesMark Felder
2019-05-20Merge branch 'feature/user-configurable-mascot' into 'develop'kaniini
Feature: user configurable mascot See merge request pleroma/pleroma!1177
2019-05-20Merge branch 'doc/mrf-simple-report-removal' into 'develop'kaniini
Document MRF.Simple :report_removal See merge request pleroma/pleroma!1179
2019-05-21Document MRF.Simple :report_removalAaron Tinio
2019-05-21Add virtual :thread_muted? fieldAaron Tinio
that may be set when fetching activities
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-20Add changelog entry for mascot configSadposter
2019-05-20Use string map for default mascotSadposter
2019-05-20Format mascot testsSadposter
2019-05-20Add mascot get/set testsSadposter
2019-05-20Add API endpoints for a custom user mascotSadposter
2019-05-19Merge branch 'feature/mrf-simple-report-filtering' into 'develop'kaniini
Add report filtering to MRF.SimplePolicy Closes #610 See merge request pleroma/pleroma!1176
2019-05-20Add report filtering to MRF.SimplePolicyAaron Tinio
2019-05-18Merge branch 'feature/mrf-always-nsfw' into 'develop'rinpatch
suppress link previews from posts marked sensitive Closes #865 See merge request pleroma/pleroma!1173
2019-05-18Merge branch 'feature/http-ua-header-always' into 'develop'Haelwenn
http: request builder: send user-agent when making requests Closes #546 See merge request pleroma/pleroma!1174
2019-05-17add Changelog entryWilliam Pitcock
2019-05-17also suppress link previews from posts marked #nsfwWilliam Pitcock
2019-05-17add CHANGELOG entryWilliam Pitcock
2019-05-17config: make sending the user agent configurable, disable sending the user ↵William Pitcock
agent in tests
2019-05-17http: request builder: send user-agent when making requestsWilliam Pitcock
2019-05-17rich media: suppress link previews if post is marked as sensitiveWilliam Pitcock