summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-05-29Merge branch 'fix/link-headers' into 'develop'lambda
2018-05-29MastoAPI: Fix link headers with restrictive params.eal
2018-05-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-28Only return certain activities in TwitterAPI mentions.lain
2018-05-28Update pleroma.nginxDominik V. Salonen
2018-05-27Merge branch 'feature/mastodon-context-microformat' into 'develop'lambda
2018-05-27run mix formatWilliam Pitcock
2018-05-27tests: update for html changesWilliam Pitcock
2018-05-27formatter: use class='mention' on links to user profilesWilliam Pitcock
2018-05-26Fix user topic streaming.lain
2018-05-26Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into developlain
2018-05-26Simplify DM query.lain
2018-05-26Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-apilain
2018-05-26There are no symbols in JSON.lain
2018-05-26Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' ...lain
2018-05-26Formatting.lain
2018-05-26Make Mastodon follow hack more explicit.lain
2018-05-26Don't treat remote accepts/rejects as local.lain
2018-05-26Rename id helper method.lain
2018-05-26tests: add tests to verify the accept request is discarded if no follow activ...William Pitcock
2018-05-26activitypub transmogrifier: use fetch_latest_follow to verify a follow object...William Pitcock
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