about summary refs log tree commit diff
path: root/app/controllers/api
AgeCommit message (Expand)Author
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Optional notification muting (#5087)Surinna Curtis
2017-11-15Filter searched toots to be consistent with blocking behaviors (#5383)ThibG
2017-11-11Updates per code reviewaschmitz
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
2017-10-25Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-d...David Yip
2017-10-22Added a timeline for Direct statusesMatthew Walsh
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-09Fix pagination in Api::V1::BlocksController (#5285)Akihiko Odaki
2017-10-05Improve admin UI for custom emojis, add copy/disable/enable (#5231)Eugen Rochko
2017-10-04Non-Serial ("Snowflake") IDs (#4801)aschmitz
2017-10-03Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)ThibG
2017-09-30Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)Eugen Rochko
2017-09-28Add ability to specify alternative text for media attachments (#5123)Eugen Rochko
2017-09-28Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstreamOndřej Hruška
2017-09-23New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)Eugen Rochko
2017-09-16Fix error when following locked accounts (#4896)Eugen Rochko
2017-09-13Fixed a typo that was breaking the account mute API endpointSurinna Curtis
2017-09-13Refactor handling of default params for muting to make code cleanerSurinna Curtis
2017-09-13Define a serializer for /api/v1/mutes/detailsSurinna Curtis
2017-09-13Add a /api/v1/mutes/details route that just returns the array of mutes.Surinna Curtis
2017-09-13Less gross passing of notifications flagSurinna Curtis
2017-09-13API support for muting notifications (and specs)Surinna Curtis
2017-09-11Fix error when following locked accounts (#4896)Eugen Rochko
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Fix POST /api/v1/follows error when already following (#4878)Eugen Rochko
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
2017-09-05Fix #4794 - Fake instant follow in API response when account is believed unlo...Eugen Rochko
2017-09-01Make PreviewCard records reuseable between statuses (#4642)Eugen Rochko
2017-08-31Embed modal (#4748)Eugen Rochko
2017-08-30Update status embeds (#4742)Eugen Rochko
2017-08-26authorize-follow-requests-after-unlocking (#4658)masarakki
2017-08-25Pinned statuses (#4675)Eugen Rochko
2017-08-21Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credential...Eugen Rochko
2017-08-18Don't send Link header when don't know prev and next links (#4633)Yamagishi Kazutoshi
2017-08-15Fix require_user! behavior when not logged in (#4604)abcang
2017-08-13ActivityPub delivery (#4566)Eugen Rochko
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25Merge queries in Api::V1::FavouritesController (#4359)Akihiko Odaki
2017-07-23feat: Enable push subscription for mobile devices by default (#4321)Sorin Davidoi
2017-07-21New notification cleaning mode (#89)Ondřej Hruška
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
2017-07-20Fix webfinger retries (#4275)Eugen Rochko
2017-07-15Merge upstream (#81)kibigo!
2017-07-15Raise search results count to 10 for testOndřej Hruška
2017-07-15Improve ActivityPub representations (#3844)Eugen Rochko