327 Commits (e45bb3f8931e34e74cdc0acd8df900f6fd1e3ada)

Author SHA1 Message Date
Claire d10b08ea1f Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
Claire b2a89bf38e Update Mastodon to Rails 6.1 (#15910)
4 years ago
Claire 5a89279d20 Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
Claire 7411520821 Change ResolveAccountService's handling of skip_webfinger (#15750)
4 years ago
Claire 77a975a964 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Levi Bard 87d45a9cd8 Fix muting users with duration via the REST api (#15516)
4 years ago
Thibaut Girka 060df6c5c9 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG a609802736 Fix not being able to unfavorite toots one has lost access to (#15192)
4 years ago
Thibaut Girka 64ef99a31e Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Eugen Rochko 38be9af436 Add support for reversible suspensions through ActivityPub (#14989)
4 years ago
Thibaut Girka db1f81553e Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Takeshi Umeda 385c2eac6f Add account sensitized (#14361)
4 years ago
Thibaut Girka d890bf9478 Remove glitch-soc specific and obsolete /api/v1/mutes/details
4 years ago
Thibaut Girka 7a84a84fc1 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Eugen Rochko 02c4c91faa Add option to be notified when a followed user posts (#13546)
4 years ago
Thibaut Girka f800c99b60 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG 4e292c23d6 Fix not being able to unbookmark toots when blocked by their author (#14604)
4 years ago
Thibaut Girka 654fd69903 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG c9fbf47a23 Fix being unable to unboost when blocked by their author (#14308)
4 years ago
Thibaut Girka 4853a87df8 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
dependabot-preview[bot] e7e09d3b7b Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)
5 years ago
Thibaut Girka 4e4e5316c1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 5479d33843 Fix own following/followers not showing muted users (#13614)
5 years ago
Thibaut Girka 0fd3f87ea2 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko a4668d994b Add specific rate limits for posting and following (#13172)
5 years ago
Thibaut Girka 07adbc487b Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko e0db9f37f5 Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)
5 years ago
Thibaut Girka a8e43875a5 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko f95fd62bac Add announcements (#12662)
5 years ago
Thibaut Girka 2591cedcad Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 413cb7e861 Fix base64-encoded file uploads not being possible (#12748)
5 years ago
ThibG f0cca7a79f Hide blocked users from more places (#12733)
5 years ago
Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Gomasy d13e680f74 Support min_id-based pagination for bookmarks (#12381)
5 years ago
Jennifer Glauche 0aae35e310 make it not return http 400 when passing and empty source argument (#12259)
5 years ago
ThibG 517c1cd062 Add bookmarks (#7107)
5 years ago
Thibaut Girka e143653d3a Fix tests being broken because of different default setting
5 years ago
Thibaut Girka 2e38d889a3 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 8824964836 Remove deprecated `GET /api/v1/search` API (#11823)
5 years ago
ThibG 875d2e2b59 Add updated relationship to follow request API responses (#11800)
5 years ago
Eugen Rochko 89989b6255 Add timeline read markers API (#11762)
5 years ago
Thibaut Girka 579ccb0bb9 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 6be7b414e2 Change unconfirmed user login behaviour (#11375)
5 years ago
Thibaut Girka eecce7e59b Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko fbbcbd940d Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)
5 years ago
Thibaut Girka d7a7f21646 Merge commit '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 4931208dd8 Remove Salmon and PubSubHubbub (#11205)
5 years ago
Eugen Rochko d9f42ba34b Remove deprecated REST API `GET /api/v1/statuses/:id/card` (#11213)
5 years ago
Eugen Rochko 6cae1b40bf Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)
5 years ago
Thibaut Girka 1177694c3e Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 433036ab8c Add moderation API (#9387)
5 years ago
Thibaut Girka a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f3a02e70a8 Fix poll API not requiring authentication on non-public polls (#10960)
6 years ago
Thibaut Girka d445d5833e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Paul Woolcock 626844dfb1 Add `account_id` param to `GET /api/v1/notifications` (#10796)
6 years ago
trwnh d8e5268939 Change bio limit from 160 to 500 (#10790)
6 years ago
Thibaut Girka 5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c84c30c542 Improve blocked view of profiles (#10491)
6 years ago
Thibaut Girka 5eb2632410 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 4cd944d364 Hide blocking accounts from blocked users (#10442)
6 years ago
Thibaut Girka c37bc0b268 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a3c41f3532 Add Keybase integration (#10297)
6 years ago
Thibaut Girka c0b876f726 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 4a3acdc916 Add polls (#10111)
6 years ago
Thibaut Girka a78447a6a4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ysksn ff774bc6e3 Not to skip executable specs (#9753)
6 years ago
Eugen Rochko ae1aaa3b8a Add scheduled statuses (#9706)
6 years ago
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko bbf9f4f93b Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ysksn 977e743d7a Add spec for Api::V1::Timelines::DirectController (#9547)
6 years ago
ysksn 9414dea099 Add specs for Api::V1::Instances::PeersController (#9546)
6 years ago
ysksn 07c0f6dcab Add spec for Api::V1::EndorsementsController (#9543)
6 years ago
ysksn 4b972f332e Add spec for Api::V1::Instances::ActivityController (#9545)
6 years ago
ysksn 18469c65e8 Add specs for Accounts::PinsController (#9542)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 00d31a292c rubocop issues - Cleaning up (#8912)
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social a53bcb6213 Lint pass (#8876)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5ddcdf3753 Support min_id-based pagination in REST API (#8736)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jakub Mendyk 9c11d260e1 Make Api::V1::MutesController paginate properly (#8472)
6 years ago
S.H 2b9de88f26 Update Rails (#8141)
6 years ago
S.H 81bd37b1a7 Update Rails (#8141)
6 years ago
Thibaut Girka 7def9b7026 Introduce OAuth scopes for bookmarks
6 years ago
Thibaut Girka cf8121376b Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko 34fdf77f48 Add more granular OAuth scopes (#7929)
6 years ago
Eugen Rochko aa4e75166b Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko d878e3e945 Keyword/phrase filtering (#7905)
6 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Shuhei Kitagawa 6dfc8999f7 Add tests for embeds controller (#7719)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 7da649efb4 Use raw status code on have_http_status (#7214)
7 years ago
Thibaut Girka 739f76403f Add spec for bookmark endpoints
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard 6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
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
abcang 7fc5cf7a12 Keep WebPush settings (#5879)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
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 582dd1b7c7 Optional notification muting (#5087)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
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
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
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
aschmitz 618df7a5ee Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Eugen Rochko f10a687118 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 86d02930c7 Add more specs for the /api/v1/mutes/details endpoint
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 1e69cc4228 API support for muting notifications (and specs)
7 years ago
Eugen Rochko e054961051 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 2f872fc0aa Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
Eugen Rochko 078c84fbb5 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
unarist 34603e0154 Raise an error for remote url in StatusFinder (#4776)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko d44b84bebd Minor performance improvement for test suite (#4678)
7 years ago
Eugen Rochko 39b76d47a5 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Yamagishi Kazutoshi c0642a0042 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko 3473aac8d8 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Akihiko Odaki ebb58bc36e Cover Api::V1:FavouritesController more (#4409)
7 years ago
Akihiko Odaki 7843855f7f Introduce access token fabricators (#4401)
7 years ago
Akihiko Odaki e39c922727 Remove redundant fabrication in the spec for Api::V1::FavouritesController (#4391)
7 years ago
Sorin Davidoi 78ff8d3421 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
Eugen Rochko 75ab767791 Fix webfinger retries (#4275)
7 years ago
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
Eugen Rochko c6e46f7421 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 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
Matt Jankowski 76f986d07b Clean up for api/base controller (#3629)
8 years ago