557 Commits (2eb054c07f37fc2a7b3881e25e4d26a3410fe56b)

Author SHA1 Message Date
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ba84b6d4d7
Add `visibility` param to reblog REST API (#9851)
6 years ago
Eugen Rochko d94e21f933
Add a preferences API so apps can share basic behaviours (#10109)
6 years ago
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 51e154f5e8
Admission-based registrations mode (#10250)
6 years ago
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 06663fcf87
Fix `tagged` param not being normalized before querying tags (#10249)
6 years ago
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 230a012f00
Add polls (#10111)
6 years ago
Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang a5e7ada62f Improve account media query (#10121)
6 years ago
Eugen Rochko e7f20cc43f
Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
6 years ago
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc84a407f4
Add vapid_key to the application entity in the REST API (#10058)
6 years ago
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 364f2ff9aa
Add featured hashtags to profiles (#9755)
6 years ago
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 32daecffef
Fix REST API showing non-public reblogs for a given status (#9850)
6 years ago
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 43c61bca60
Add locale param to sign-up API (#9747)
6 years ago
Eugen Rochko 5dbe186585
Add cache to custom emojis API (#9732)
6 years ago
Eugen Rochko a49d43d112
Add scheduled statuses (#9706)
6 years ago
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ee1ba59692
Add exclude_reblogs option to account statuses API (#9640)
6 years ago
Takeshi Umeda bf70e5cfda Add error message with invalid email confirmation (#9625)
6 years ago
Eugen Rochko 5d2fc6de32
Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG e25947db4a Sanitize and sandbox toot embeds (#9552)
6 years ago
Eugen Rochko 108b2139cd
Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)
6 years ago
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka 06c7fb8015 Add backend support to read and update list-specific show_replies settings
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d6b9a62e0a
Extract counters from accounts table to account_stats table (#9295)
6 years ago
Thibaut Girka 9201398507 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6d59dfa15d
Optimize the process of following someone (#9220)
6 years ago
Thibaut Girka 36dab188fd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel 4c03e05a4e Allow joining several hashtags in a single column (#8904)
6 years ago
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a38a452481
Add unread indicator to conversations (#9009)
6 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 774ac47373
Add conversations API (#8832)
6 years ago
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 25744d43b0 Ensure only toots from the reported users are reported (#8916)
6 years ago
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f0fff3eb10
Support min_id-based pagination in REST API (#8736)
6 years ago
Yamagishi Kazutoshi 86f138ed16 Cache instance info (#8765)
6 years ago
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2288d50a7b
Add force_login option to OAuth authorize page (#8655)
6 years ago
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 0b62585748 Self-notify on accepting follow requests (#8541)
6 years ago
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jakub Mendyk f3a12ddfd0 Make Api::V1::MutesController paginate properly (#8472)
6 years ago
Quint Guvernator da13fa5021 Fix low-hanging rubocop gripes (#8458)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2f34b747b3
Allow mods to disable login, improve message when login disabled (#8329)
6 years ago
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master
6 years ago
ThibG b34d6238cb Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
abcang 9e75aa30cd Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 90b492143d Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko 6b9e03e002
Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko 9804ec3a6d
Fix missing irreversible in filters API, expires_in param (#7976)
6 years ago
Eugen Rochko 1f6ed4f86a
Add more granular OAuth scopes (#7929)
6 years ago
Eugen Rochko da8fe8079e
Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 10f51c9886
Fix domain hiding logic (#7765)
7 years ago
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
7 years ago
Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 05f8c375a2
Remove small pagination limit from context API (#7564)
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki 77cd6b5096 Do not use permitted_for scope when querying pinned statuses (#7510)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko 416f644505
Fix 404 for GET /api/v1/push/subscription (#7472)
7 years ago
Eugen Rochko 97e43ec5f0
Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
abcang db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
7 years ago
Eugen Rochko cae933510c
Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko f62ee1ddb0
Disable API access when login is disabled (#7289)
7 years ago
Eugen Rochko 54f34d3f2a
Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)
7 years ago
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
abcang 897199910f Improve web api protect (#6343)
7 years ago
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Akihiko Odaki 519119f657 Paginate ancestor statuses in public page (#7102)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard cd0eaa349c Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 33513753b9
Fix unpermitted parameters warning when generating pagination URLs (#6995)
7 years ago
Jenkins a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 37b043d447 Improve performance of account_media_status_ids (#6729)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 68218d97c8
Add only_media param to public and hashtag timelines API (#6576)
7 years ago
Eugen Rochko fce8464077
Ensure that boolean params in the API are parsed for truthiness (#6575)
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 90f12f2e5a
Focal points (#6520)
7 years ago
Eugen Rochko 4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Konrad Pozniak bb26cdda24 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
Jenkins 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang cf32f7da5c Fix response of signature_verification_failure_reason (#6441)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
abcang 3f35d43222 Exclude nil from relationships array (#6427)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 537d2939b1 Suppress CSRF token warnings (#6240)
7 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool c235711ffe Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
TheKinrar 95bd85d9e8 Represent numbers by strings in instance activity API (#6198)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
abcang fcc0795a40 Remove unused function (#5950)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Eugen Rochko 2f4c5f504f
Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
ThibG 58bca7b1e4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
aschmitz 5128c4261e Updates per code review
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
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
ThibG dfaa219f88 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
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
Eugen Rochko d1a78eba15 Embed modal (#4748)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
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
Yamagishi Kazutoshi 2edfdab6e6 Don't send Link header when don't know prev and next links (#4633)
7 years ago
abcang e120d09c98 Fix require_user! behavior when not logged in (#4604)
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
Sorin Davidoi 9075c90c46 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
Ondřej Hruška 604654ccb4 New notification cleaning mode (#89)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275)
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
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago