Commit Graph

1587 Commits (87566b6e2f48ee2b82d4af7ccb6200ff8bc721d1)
 

Author SHA1 Message Date
eal 87566b6e2f user.ex: add domain blocks.
6 years ago
lain 9d054d30bc Revert "Update Mastofe."
6 years ago
lain 726b131b0a Update Mastofe.
6 years ago
lain da9cbf2c05 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
eal dca1d6d162 Merge branch 'fix/user-timeline-reading-user' into 'develop'
6 years ago
eal 8c609ee3f9 MastoAPI user timelines: render statuses for the logged in user.
6 years ago
lambda 98b8f08783 Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
6 years ago
eal 935e544e19 TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
lain 5e76adb07e Fix url guessing attacks.
6 years ago
lain 349400c06a Fix url guessing attacks.
6 years ago
eal 196d36a7d5 Merge branch 'fix/dm-timeline-activities' into 'develop'
6 years ago
eal 7cb2e2971e MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
lambda 8bd7ace420 Merge branch 'patch-3' into 'develop'
6 years ago
lambda 52b0413719 Merge branch 'fix/link-headers' into 'develop'
6 years ago
eal 35cb8969c4 MastoAPI: Fix link headers with restrictive params.
6 years ago
lain 461f201caa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain 3ece4a3ebc Only return certain activities in TwitterAPI mentions.
6 years ago
Dominik V. Salonen a6fd9c4b00 Update pleroma.nginx
6 years ago
lambda 8216d5e40e Merge branch 'feature/mastodon-context-microformat' into 'develop'
6 years ago
William Pitcock d7eb2e1b65 run mix format
6 years ago
William Pitcock f569b67cda tests: update for html changes
6 years ago
William Pitcock a8df7fc690 formatter: use class='mention' on links to user profiles
6 years ago
lain a9e36e5a64 Fix user topic streaming.
6 years ago
lain 46cc6fab07 Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
6 years ago
lain 841ee8e3e4 Simplify DM query.
6 years ago
lain 4b3ec53514 Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
lain 6138b29783 There are no symbols in JSON.
6 years ago
lain 745072b2cc Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
lain 0a6c897c94 Formatting.
6 years ago
lain bfce29866f Make Mastodon follow hack more explicit.
6 years ago
lain 3839a11ef5 Don't treat remote accepts/rejects as local.
6 years ago
lain dd9bb37893 Rename id helper method.
6 years ago
William Pitcock 1db0dc3072 tests: add tests to verify the accept request is discarded if no follow activity could be found
6 years ago
William Pitcock 7e873756e7 activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
6 years ago
lambda e1fe46e1cf Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
6 years ago
William Pitcock 1c926c7b60 activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
William Pitcock 7cf3cf77cf activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
6 years ago
William Pitcock f35e6bf75b activitypub transmogrifier: clean up accept/reject handling a bit
6 years ago
William Pitcock e80d91c64a introduce User.maybe_direct_follow() and use it where we used to call User.follow()
6 years ago
William Pitcock c89b90222c twitter api: also remove explicit User.follow here
6 years ago
William Pitcock 62c95e8d4d run mix format
6 years ago
lambda 5d6d86bf00 Merge branch 'feature/blocks-deny-refollow' into 'develop'
6 years ago
lambda caae83e6d5 Merge branch 'bugfix/follow-query-overhead' into 'develop'
6 years ago
William Pitcock 502ba33d01 activitypub: fix up accept/reject semantics for following
6 years ago
William Pitcock c0ca9f82b9 mastodon api: properly track if an account is locked or not
6 years ago
William Pitcock 1f3eb0f470 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
6 years ago
William Pitcock 5f06a1a3c5 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
6 years ago
William Pitcock 47dc52a758 activitypub utils: optimize block and follow activity lookup
6 years ago
William Pitcock 1d88abf2d4 user: do not allow refollowing somebody who has blocked a user
6 years ago
William Pitcock 8d2ee70da1 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
6 years ago