summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-05-26Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'lambda
2018-05-26activitypub: allow mastodon S2S block extension support to be disabledWilliam Pitcock
2018-05-25activitypub transmogrifier: cleanups and tests for incoming accepts/rejectsWilliam Pitcock
2018-05-25activitypub transmogrifier: clean up accept/reject handling a bitWilliam Pitcock
2018-05-25introduce User.maybe_direct_follow() and use it where we used to call User.fo...William Pitcock
2018-05-25twitter api: also remove explicit User.follow hereWilliam Pitcock
2018-05-25run mix formatWilliam Pitcock
2018-05-25Merge branch 'feature/blocks-deny-refollow' into 'develop'lambda
2018-05-25Merge branch 'bugfix/follow-query-overhead' into 'develop'lambda
2018-05-25activitypub: fix up accept/reject semantics for followingWilliam Pitcock
2018-05-25mastodon api: properly track if an account is locked or notWilliam Pitcock
2018-05-25testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI....William Pitcock
2018-05-25testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI....William Pitcock
2018-05-25activitypub utils: optimize block and follow activity lookupWilliam Pitcock
2018-05-25user: do not allow refollowing somebody who has blocked a userWilliam Pitcock
2018-05-25testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI....William Pitcock
2018-05-24Merge branch 'feature/lists' into 'develop'lambda
2018-05-24Merge branch 'feature/incoming-remote-unfollow' into 'develop'lambda
2018-05-24Rewrite block fetch queryFrancis Dinh
2018-05-24update frontendlain
2018-05-24Merge branch 'feature/change-password' into 'develop'lambda
2018-05-24MastoAPI: add lists.eal
2018-05-24More efficient queries.lain
2018-05-24MastoAPI: add lists.eal
2018-05-23Don't save double tags in AP objects we createlain
2018-05-23Merge branch 'feature/deps-migration' into 'develop'lambda
2018-05-23Repair some access-control headers required for third-party webclientsNiklas Poslovski
2018-05-22Merge branch 'nipos-develop' into developlain
2018-05-22Add access-control-expose-headers to Nginx default configNiklas Poslovski
2018-05-22Hook up block/unblock to TwitterAPIFrancis Dinh
2018-05-22Hook unfollow into TwitterAPIFrancis Dinh
2018-05-22Hook up unfollow and (un)block to MastoAPI + testsFrancis Dinh
2018-05-21Merge branch 'develop' into feature/mstdn-direct-apicsaurus
2018-05-21Fixed testSyldexia
2018-05-21Added endpoint for changing passwordsSyldexia
2018-05-21Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda
2018-05-21activitypub controller: note that the HTTP Host header must be forwarded for ...William Pitcock
2018-05-21Pass correct number of arguments to unfollowFrancis Dinh
2018-05-21Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda
2018-05-21webfinger: fix finding the XRD uri for statusnet instancesWilliam Pitcock
2018-05-21Actually fix missing alias.lain
2018-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-21Add missing alias.lain
2018-05-21Add tests for incoming unfollow over OStatusFrancis Dinh
2018-05-21Fix unblock handlingFrancis Dinh
2018-05-21Handle unfollows from OStatusFrancis Dinh
2018-05-21Add undo block handlerFrancis Dinh
2018-05-20FormatFrancis Dinh
2018-05-20Fix unfollowsFrancis Dinh
2018-05-20pass user to User.blocks?/2 instead of ap_idFrancis Dinh