Commit Graph

1142 Commits (fc012491a5174139b06cc9945e6dc4bc687ebdb7)

Author SHA1 Message Date
lambda fc012491a5 Merge branch 'fix/mutes.json-emptyarray' into 'develop'
6 years ago
lambda dfc96f222c Merge branch 'feature/configurable-blocks' into 'develop'
6 years ago
squidboi ea214b8ba6
combined outgoing_blocks with statement
6 years ago
Vivian Lim 6160a1b3c0 mix format
6 years ago
Vivian Lim 1299bccc7d return unquoted empty array from /api/qvitter/mutes.json
6 years ago
Vivian Lim 6316003946 fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
Vivian Lim f2badd4424 return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
squidboi c4038ede07
fix mind-crushingly dumb syntax error
6 years ago
squidboi f4990283de
change moved attributes into normal variables
6 years ago
squidboi 4e099fcfa9
move configurable module attributes into relevant functions
6 years ago
Haelwenn (lanodan) Monnier 5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
6 years ago
Haelwenn (lanodan) Monnier a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
Haelwenn (lanodan) Monnier 359093d73b
Fake 2.4.0 API
6 years ago
Haelwenn (lanodan) Monnier c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
6 years ago
William Pitcock 60d6038be5 mrf simple: add accept lists
6 years ago
lambda 90cf75f4a7 Merge branch 'features/column_media_streaming' into 'develop'
6 years ago
lambda db0731b6ac Merge branch 'feature/exclude-replies-filter' into 'develop'
6 years ago
William Pitcock c95941e64d activitypub transmogrifier: fix handling of contentMap.
6 years ago
William Pitcock 4f589998ee activitypub: support filtering activities by whether or not they are a reply (closes #109)
6 years ago
Haelwenn (lanodan) Monnier b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
6 years ago
squidboi 2e294ee44a Merge branch 'develop' into feature/configurable-blocks
6 years ago
lambda 1ea4a18ad8 Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
6 years ago
eal a938d07df1 Merge branch 'bugfix/mastofe_thread_render' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
lain 00d7d109ef Fix typo
6 years ago
lambda 2723fb5150 Merge branch 'bugfix/mrf-orphaning' into 'develop'
6 years ago
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop'
6 years ago
lambda 2c303b3302 Merge branch 'bugfix/oauth2-param-name' into 'develop'
6 years ago
lambda 280ac243aa Merge branch 'bugfix/oauth-password-with-email' into 'develop'
6 years ago
William Pitcock 5442466569 oauth: fix password-based login when username is email address
6 years ago
William Pitcock 4894b88b1b oauth: support either name or username parameter with grant_type=password
6 years ago
Francis Dinh 1555c66650 Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
William Pitcock 401e8af943 activitypub transmogrifier: handle activity lookup failure
6 years ago
William Pitcock b5bc08fac3 streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
lambda ea42ba603f Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
6 years ago
William Pitcock 3d402a9e20 webfinger: send JRD by default instead of XRD
6 years ago
William Pitcock 59f95a7095 webfinger: refactor webfinger() functions
6 years ago
lambda 3f42806b1b Merge branch 'develop' into 'develop'
6 years ago
lambda 564c73ab24 Merge branch 'feature/list-streaming' into 'develop'
6 years ago
William Pitcock 9810471237 router: remove stub /domain_blocks entry
6 years ago
William Pitcock f8e0942745 twitter api: add approve/deny endpoints
6 years ago
William Pitcock e08cf21e5b twitter api: add friend requests list api
6 years ago
William Pitcock ba8dab7542 twitterapi: user view: return if an account is locked or not
6 years ago
William Pitcock d96377f359 activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
6 years ago
William Pitcock 5eed1ea181 run mix format
6 years ago
William Pitcock 993312cdb3 twitterapi: add profile setting for locked/unlocked accounts
6 years ago
William Pitcock 4084889a2d activitypub transmogrifier: remove debug code
6 years ago
William Pitcock 1452b2823f user: add a workaround for situations where Pleroma may believe a followee is followed
6 years ago
William Pitcock 76f80ba8c2 activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
6 years ago
William Pitcock a2c4a5a75b mastodon api: allow setting an account locked or not
6 years ago