253 Commits (56f53231946fa760bf9a898d8b7bcfc58ee7f59f)

Author SHA1 Message Date
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Konrad Pozniak fa710fd496 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
abcang 6e12cb4524 Exclude nil from relationships array (#6427)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
TheKinrar 3491c5e145 Represent numbers by strings in instance activity API (#6198)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
ThibG 74de5566d4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
aschmitz 76008c3e8c Updates per code review
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko f10a687118 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis c872ae6e76 Fixed a typo that was breaking the account mute API endpoint
7 years ago
Surinna Curtis 3688a48100 Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis 8a90d61de0 Define a serializer for /api/v1/mutes/details
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 277f0e69a8 Less gross passing of notifications flag
7 years ago
Surinna Curtis 1e69cc4228 API support for muting notifications (and specs)
7 years ago
Eugen Rochko e054961051 Fix error when following locked accounts (#4896)
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 078c84fbb5 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
masarakki d8f136cb8b authorize-follow-requests-after-unlocking (#4658)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko 39b76d47a5 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Akihiko Odaki 98ba57efca Merge queries in Api::V1::FavouritesController (#4359)
7 years ago
Ondřej Hruška 87d95a1eb5 New notification cleaning mode (#89)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Ondřej Hruška 2706eef783 Raise search results count to 10 for test
7 years ago
unarist df81145b7c Fix response of unreblog/unfavourite APIs (#4204)
7 years ago
Ondřej Hruška 1eeead616d Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Eugen Rochko 9fff81f676 Fix #3462 - Require authentication for search API (#4155)
7 years ago
Yamagishi Kazutoshi 2ffd2303ee Add attribute for default privacy to verify credentials (#4075)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
Matt Jankowski e31cd944c2 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
Matt Jankowski dc717cf425 Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
Yamagishi Kazutoshi 5da41e0cae Improve RuboCop rules (compatibility to Code Climate) (#3636)
8 years ago
Matt Jankowski 76f986d07b Clean up for api/base controller (#3629)
8 years ago
Daigo 3 Dango e1142e190b Redirect to streaming_api_base_url (#3579)
8 years ago
Naoki Kosaka 13aa805de8 Fix limit_param in favourites_controller.rb (#3553)
8 years ago
Matt Jankowski 1066fd1ab5 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski 0985a9ff7d Improve spec coverage and clean up api/v1/blocks controller (#3464)
8 years ago
Matt Jankowski ae721f376a Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
8 years ago
Matt Jankowski e32b9ecbf6 Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
8 years ago
Matt Jankowski 7b8b5b9f1e Refactor api/v1/notifications controller (#3470)
8 years ago
Matt Jankowski 6237abaaa3 Improve spec coverage and clean up api/v1/favourites controller (#3472)
8 years ago
Matt Jankowski 3e95a6c9b7 Improve spec coverage and clean up api/v1/mutes controller (#3481)
8 years ago
Matt Jankowski b89dbac199 Refactor and spec coverage for api/v1/timelines actions (#3482)
8 years ago
Matt Jankowski 12e795d0a7 Refactor api/v1/apps controller (#3471)
8 years ago
Matt Jankowski cc92e6be3e Refactor api/v1/reports controller (#3469)
8 years ago
Matt Jankowski 3d2927caa2 Refactor api/v1/search controller (#3468)
8 years ago
Matt Jankowski 8b69d8d46d Improve spec coverage and clean up api/v1/media controller (#3467)
8 years ago
Jack Jennings 4e75c71b3e Add status destroy authorization to policy (#3453)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
unarist af368a2d12 More use of next link header on account (media) timelines (#3311)
8 years ago
unarist 9642bdbe0a Fix following/followers API to return correct link headers (#3268)
8 years ago
Matt Jankowski fecc2c2f47 Refactor of API timeline actions (#3263)
8 years ago
Akihiko Odaki 90c8175cb0 Fix mutes_controller error and incorrect statuses_controller report (#3202)
8 years ago
Akihiko Odaki f23a0655fe Fix regressions in api/v1 (#3178)
8 years ago
Yamagishi Kazutoshi ee5e342a42 Fix block list 500 (#3174)
8 years ago
Akihiko Odaki 9d32e7f6d5 Use joins for account properties (#3167)
8 years ago
Eugen Rochko 5695449335 Add buttons to block and unblock domain (#3127)
8 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
8 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
8 years ago
Eugen Rochko 553d6a1ea6 Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents (#2419)
8 years ago