171 Commits (4a64181461cb02599da98166da4b527adbb705ad)

Author SHA1 Message Date
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Akihiko Odaki cc796298c9 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Eugen Rochko eb605141ff Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko ad8e856a5b Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 79d8911116 Fixed a typo that was breaking the account mute API endpoint
7 years ago
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis af2d793398 Define a serializer for /api/v1/mutes/details
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 0c547faf92 Less gross passing of notifications flag
7 years ago
Surinna Curtis eaaf2170fe API support for muting notifications (and specs)
7 years ago
Eugen Rochko 0ef9d45d05 Fix error when following locked accounts (#4896)
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko c450ddb613 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
masarakki 649a20ab46 authorize-follow-requests-after-unlocking (#4658)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Eugen Rochko 74e5078795 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Akihiko Odaki a6ea7e282f Merge queries in Api::V1::FavouritesController (#4359)
7 years ago
Ondřej Hruška 604654ccb4 New notification cleaning mode (#89)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Ondřej Hruška 99f24ab0c7 Raise search results count to 10 for test
7 years ago
unarist 1896a154f5 Fix response of unreblog/unfavourite APIs (#4204)
7 years ago
Ondřej Hruška 75aafc932e Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Eugen Rochko f93de3a516 Fix #3462 - Require authentication for search API (#4155)
7 years ago
Yamagishi Kazutoshi f8212da329 Add attribute for default privacy to verify credentials (#4075)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Eugen Rochko 42b8220632 Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
Matt Jankowski 2925372ff4 Move create/destroy actions for api/v1/statuses to namespace (#3678)
7 years ago
Matt Jankowski 5282ba862a Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
7 years ago
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636)
7 years ago
Matt Jankowski 73540ffe6b Clean up for api/base controller (#3629)
7 years ago
Daigo 3 Dango 2985d08951 Redirect to streaming_api_base_url (#3579)
7 years ago
Naoki Kosaka e014bf8ed0 Fix limit_param in favourites_controller.rb (#3553)
7 years ago
Matt Jankowski 5c63523972 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
7 years ago
Matt Jankowski 5236a62861 Improve spec coverage and clean up api/v1/blocks controller (#3464)
7 years ago
Matt Jankowski 0f155829b7 Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
7 years ago
Matt Jankowski 84dda45df9 Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
7 years ago
Matt Jankowski 9c7505489f Refactor api/v1/notifications controller (#3470)
7 years ago
Matt Jankowski 75cad1d9d6 Improve spec coverage and clean up api/v1/favourites controller (#3472)
7 years ago
Matt Jankowski bf811e4d4a Improve spec coverage and clean up api/v1/mutes controller (#3481)
7 years ago