aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-06-12Replace avi.png with the Pleroma logoArtik Banana
2018-06-12Merge branch 'develop' into 'develop'lambda
2018-06-12Update sample_config.eexlambda
2018-06-12Merge branch 'feature/list-streaming' into 'develop'lambda
2018-06-12Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda
2018-06-12Merge branch 'patch-2' into 'develop'lambda
2018-06-11router: remove stub /domain_blocks entryWilliam Pitcock
2018-06-11* Removed TLSv1 and TLSv1.1Artik Banana
2018-06-11Security upgrades:Artik Banana
2018-06-11tests: update twitterapi user view tests for new locked variableWilliam Pitcock
2018-06-11twitter api: add approve/deny endpointsWilliam Pitcock
2018-06-11tests: add tests for /api/pleroma/friend_requestsWilliam Pitcock
2018-06-11twitter api: add friend requests list apiWilliam Pitcock
2018-06-11twitterapi: user view: return if an account is locked or notWilliam Pitcock
2018-06-11activitypub transmogrifier: accept/reject outgoing: we might send the actual ...William Pitcock
2018-06-11run mix formatWilliam Pitcock
2018-06-11twitterapi: add profile setting for locked/unlocked accountsWilliam Pitcock
2018-06-11tests: assert the state prior to mutating it as well as afterwardWilliam Pitcock
2018-06-11testsuite: add mastodon api testsWilliam Pitcock
2018-06-11activitypub transmogrifier: remove debug codeWilliam Pitcock
2018-06-11user: add a workaround for situations where Pleroma may believe a followee is...William Pitcock
2018-06-11activitypub: when unfollowing, update the follow activity's disposition to 'c...William Pitcock
2018-06-11mastodon api: allow setting an account locked or notWilliam Pitcock
2018-06-11user: use Enum.uniq on the follow request queryWilliam Pitcock
2018-06-11activitypub transmogrifier: send Rejects in the format Mastodon wantsWilliam Pitcock
2018-06-11activitypub transmogrifier: send @context on accept activitiesWilliam Pitcock
2018-06-11add a bunch of stuffWilliam Pitcock
2018-06-11stash api controllerWilliam Pitcock
2018-06-11implement tracking of follow requestsWilliam Pitcock
2018-06-11activitypub transmogrifier: learn locked state in Update messagesWilliam Pitcock
2018-06-11activitypub: only send accept back automatically if the account is not lockedWilliam Pitcock
2018-06-11mix: add task for setting an account as locked or notWilliam Pitcock
2018-06-11Merge branch 'fix/mix-task-caching' into 'develop'eal
2018-06-11make_moderator.ex: set cache on updateeal
2018-06-11Merge branch 'feature/domain-blocks' into 'develop'lambda
2018-06-08Merge branch 'users' into 'develop'lambda
2018-06-08Merge branch 'feature/rejectnonpublic' into 'develop'lambda
2018-06-07Fix users lookup/return typeRachel H
2018-06-08Merge branch 'mastopost' into 'develop'lambda
2018-06-07s/get_by_ap_id/get_cached_by_ap_id/squidboi
2018-06-07final formatsquidboi
2018-06-07even more formattingsquidboi
2018-06-08Merge branch 'bugfix/locked-account-regression' into 'develop'lambda
2018-06-07more formattingsquidboi
2018-06-07formattingsquidboi
2018-06-07add mrf for dropping follower-only and direct postssquidboi
2018-06-08user: fix maybe_direct_follow() after user_info() refactoring broke it slightlyWilliam Pitcock
2018-06-08tests: add regression test for locking/unlocking account updatesWilliam Pitcock
2018-06-08activitypub transmogrifier: fix locked account state from being clobberedWilliam Pitcock
2018-06-08activitypub transmogrifier: learn locked state in Update messagesWilliam Pitcock