aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-05Pleroma Conversations API: Add a way to set recipients.lain
2019-08-02Pleroma API: Add endpoint to get conversation statuses.lain
2019-08-02CommonAPI: Extend api with conversation replies.lain
2019-08-02Conversations: Add recipient list to conversation participation.lain
2019-08-01nothinglain
2019-07-31StatusView: Return direct conversation id.lain
2019-07-29Merge branch 'security/remote-follow-commonapi' into 'develop'kaniini
2019-07-29twitter api: utils: rework do_remote_follow() to use CommonAPIAriadne Conill
2019-07-29Merge branch 'revert-83508418' into 'develop'kaniini
2019-07-29Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"kaniini
2019-07-29Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'Haelwenn
2019-07-29markdown: clean up html generated by earmarkAriadne Conill
2019-07-29Merge branch 'refactor/use-constants' into 'develop'lain
2019-07-29Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini
2019-07-29Add `mailerEnabled` to the NodeInfo metadataEugenij
2019-07-29Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini
2019-07-29Redirect not logged-in users to the MastoFE login page on private instancesSergey Suprunenko
2019-07-29Merge branch 'tests/ostatus_controller' into 'develop'kaniini
2019-07-29added tests for OstatusControllerMaksim
2019-07-29constants: add as_public constant and use it everywhereAriadne Conill
2019-07-29mix: add ex_const dependencyAriadne Conill
2019-07-28Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini
2019-07-28transmogrifier: use User.delete() instead of handrolled user deletion code fo...Ariadne Conill
2019-07-28Merge branch 'confirmation-resend' into 'develop'kaniini
2019-07-28add account confirmation email resend in mastodon apiSachin Joshi
2019-07-28Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini
2019-07-28fixed User.update_and_set_cache for stale userMaksim
2019-07-28Merge branch 'develop' into 'develop'kaniini
2019-07-28Merge branch 'feature/hackney-303-redirect' into 'develop'kaniini
2019-07-28Handle 303 redirectsSergey Suprunenko
2019-07-28Fix HTTP sig tweak on KeyIdThomas Sileo
2019-07-26Merge branch 'issue/1097' into 'develop'rinpatch
2019-07-26[#1097] added redirect: /pleroma/admin -> /pleroma/admin/Maksim
2019-07-26Merge branch 'changelog/1484-base_url-remove-media' into 'develop'Haelwenn
2019-07-26CHANGELOG.md: Add entry for !1484Haelwenn (lanodan) Monnier
2019-07-25Merge branch 'tests/filter_dedupe' into 'develop'kaniini
2019-07-25fixed test for elixir 1.7.4Maksim
2019-07-24Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini
2019-07-24Merge branch 'fix/put-correct-activity-url' into 'develop'kaniini
2019-07-24Show the url advertised in the Activity in the Status JSON responseSergey Suprunenko
2019-07-25Add WebFinger test for AP-only accountkPherox
2019-07-24Merge branch 'fix/Upload_base_url' into 'develop'kaniini
2019-07-24Do not prepend /media/ when using base_urlfeld
2019-07-25Change to not require `magic-public-key` on WebFingerkPherox
2019-07-24Merge branch 'tests/web_finger' into 'develop'kaniini
2019-07-24tests WebFingerMaksim
2019-07-24Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini
2019-07-24Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relations...Eugenij
2019-07-24Merge branch 'develop' into 'develop'lain
2019-07-24check both item and parent domain blockssadposter