summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2019-05-21Change validation error status codes to be more appropriaterinpatch
2019-05-21Do not stream out poll repliesrinpatch
2019-05-21Restrict poll replies when fetching activiites for contextrinpatch
2019-05-21Actual vote count in poll viewrinpatch
2019-05-21Fix posting non-polls from mastoferinpatch
2019-05-21Handle poll votesrinpatch
2019-05-21Enforce poll limits and add error handling for MastodonAPI's post endpointrinpatch
2019-05-21Add poll limits to /api/v1/instance and initial staterinpatch
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