832 Commits (2db0506226d0de38115e912a632d7a30afeb651e)

Author SHA1 Message Date
Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 32d4372381
Use #any? instead of #exists? when checking media attachments (#7570)
7 years ago
Yamagishi Kazutoshi 7403e5d306 Add media timeline (#6631)
7 years ago
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki 55fd55714a Raise Mastodon::RaceConditionError if Redis lock failed (#7511)
7 years ago
unarist d47091eb97 Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)
7 years ago
Wiktor 7fe2993b87 Fix account URI when updating ActivityPub account (#7488)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
abcang 3793e598d0 Call media.present? because media may be nil (#7474)
7 years ago
ThibG 7467361d70 Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)
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
Yamagishi Kazutoshi d2ee48977c Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424)
7 years ago
Surinna Curtis 01dfd6dbc8 Take the first recognized actor_type. (#7410)
7 years ago
ThibG 993e68a7dd Fix hashtags not being federated on mentions (fixes #6900) (#7406)
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
Eugen Rochko 0f0cc3f2eb
Support explicitly supplying language code for status via REST API (#7389)
7 years ago
Eugen Rochko c947e2e4c5
Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)
7 years ago
Eugen Rochko c73ce7b695
Store home feeds for 7 days instead of 14 (#7354)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 658cbc9425
Improve PostStatusService performance (#7317)
7 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
7 years ago
abcang 71a7cea73f Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko f62539ce5c
Remove most behaviour disparities between blocks and mutes (#7231)
7 years ago
Eugen Rochko 965345316f
Guard against nil URLs in Request class (#7284)
7 years ago
Surinna Curtis dc786c0cf4 Support Actors/Statuses with multiple types (#7305)
7 years ago
Emelia Smith 495303d9b8 Prevent suspended accounts from appearing in AccountSearchService (#7246)
7 years ago
Eugen Rochko 75c4ab9d12
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko ff87d1bc3e
Rescue SSL errors when processing mentions, remove useless line (#7184)
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
ThibG 1c379b7ef4 Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
Jenkins e3d0d72b29 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 778562c223
Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 0c52654b52 When creating status, if no sensitive status is given, use default (#7057)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson 6ff3b3e4db Fix nil account issue in ProcessAccountService (#7019)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko f890d2a766
Support all ActivityPub actor types (#6997)
7 years ago
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
Jenkins f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG e573bb0990 Fix compatibility with PeerTube (#6968)
7 years ago
David Yip f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki 40e5d2303b Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 54b273bf99 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9381a7d9d5
Use username/domain to match existing accounts in ActivityPub (#6842)
7 years ago
Jenkins 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool 566ace2d64 Add entropy to download filenames (#6811)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 510c9049c7
For now, put a "." into no-text statuses with media for backcompat (#6691)
7 years ago
Eugen Rochko 64db9ed5f6
After blocking domain with reject_media, invalidate cache (#6679)
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Aboobacker MK 49092945ab Fix 500 while searching after deleting a post (#6604)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
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 61ed133fea
Account archive download (#6460)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko f7765acf9d
Fix #5173: Click card to embed external content (#6471)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 7e5c433dfc Fix saving of oEmbed image (#6409)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
David Yip 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
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
puckipedia 74c1c9ec01 Allow attributedTo in a status to be an embedded object (#6238)
7 years ago
Jenkins 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e4a241abef
Fix bad URL schemes being accepted (#6219)
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG a594139115 When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 02ba03d6db
Send one Delete of Actor in ActivityPub when account is suspended (#6172)
7 years ago
Eugen Rochko 7d4f4f9aab
Fix FetchAtomService not finding alternatives if there's a Link header (#6170)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d319b3dbe4
Update moved-to property when it's removed too (#6160)
7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG cea98e0c12 Reduce the number of synchronous resolves when posting toots (#6075)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a8deb6648b
Fix redundant HTTP request in FetchLinkCardService (#6002)
7 years ago
Eugen Rochko 5706fe18c2
Fix #5952 - NameError (regression from #5762) (#5999)
7 years ago
Akihiko Odaki f9f6918148 Store preview image for embedded photo in preview cards (#5986)
7 years ago
Renato "Lond" Cerqueira 19257d91bf Return false if object does not respond to url (#5988)
7 years ago
Renato "Lond" Cerqueira fe180f18ff Change conditional to avoid nil into string error in sidekiq (#5987)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Erin 2efffe77dc reblog_service.rb: Status#local_only -> local_only?
7 years ago
Erin 3ec47e732b post_status_service: stylistic change (local_only -> local_only?)
7 years ago
Erin 288f1293ef set local_only in a before_create callback instead of status service
7 years ago
Erin c1410af368 post_status_service.rb: save the status after setting local_only
7 years ago
Erin 5ef65aab8f replace reblog service check for an 👁️ with #local_only
7 years ago
Erin cfbb95605b set local_only flag on statuses in post_status_service
7 years ago
Andrea Scarpino 6a82939adb Fix account and tag searches with leading/trailing spaces (#5965)
7 years ago
Yamagishi Kazutoshi e7d55df38d Ignore HEAD method if does not support (#5949)
7 years ago
Eugen Rochko 86b4d5439c
Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)
7 years ago
Jenkins 744447b3c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki c083816c24 Add embed_url to preview cards (#5775)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi d7a17b5e8b Search only from followees (#5897)
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
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 4c6b5dbe96
Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 85e97ecab6
Fix too many forwards (#5854)
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
ThibG b8efb5daed Fix handling of temporary failures in ProcessMentionsService (#5842)
7 years ago
Jenkins 8f3e5f6128 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 3dce6cbbd7 Fixed duplicating URL of photo type of oEmbed (#5763)
7 years ago
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 2bcc81700c Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
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
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3e90987c8b Fix some rubocop style issues (#5730)
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 1c25853842 Use already-known remote user data if resolving temporarily fails in mentions (#5702)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
aschmitz 5128c4261e Updates per code review
7 years ago
aschmitz b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
ThibG 889ada5ee2 Fix process mentions for local users, as local users are considered to use OStatus (#5618)
7 years ago
ThibG 5d5c0f4f43 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
ThibG 84cfee2488 Do not process undeliverable mentions (#5598)
7 years ago
ThibG 7bea1530f4 Resolve remote accounts when mentioned even if they are already known (#5539)
7 years ago
ThibG d37a56c07c Update remote ActivityPub users when fetching their toots (#5545)
7 years ago
ThibG 89c77fe225 Instantiate service classes for each call (fixes #5540) (#5543)
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
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
unarist 3bc8924940 Don't capture scheme-less URLs in the status (#5435)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
abcang 2eab41cd1a Close connection when succeeded posting (#5390)
7 years ago
ThibG 95fe20b78a Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)
7 years ago
unarist 35ec1c91e3 Fix some failure cases on FetchLinkCardService (#5347)
7 years ago
David Yip edd1a00faf Restore variable assignment in MuteService#call.
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 3888a12c79 Fix #5272 - Order of checks in ActivityPub handler (#5276)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
unarist 5c8ca024ef Improve error handling on LinkCrawlWorker (#5250)
7 years ago
ThibG 2559d9166c Fix regression in FetchRemoteResourceService (#5217)
7 years ago
ThibG 0e1b0f2747 Check Webfinger-returned author URI even when not redirected (#5213)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Yamagishi Kazutoshi d40c9140e8 Fix undefined local variable (regression from #5114) (#5210)
7 years ago
Eugen Rochko 291feba6f1 Follow up to #5172, clean up notifications after mute like after block (#5198)
7 years ago
Akihiko Odaki 63f0979799 Validate id of ActivityPub representations (#5114)
7 years ago
Eugen Rochko c743b5e1fd Fix possible acct: uri usurpation in ActivityPub account discovery (#5208)
7 years ago
Eugen Rochko 76f360c625 If HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)
7 years ago
abcang 3d9b8847d2 Flush body when POST requests (#5128)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko e528114c53 Follow-up to #4582 and #5027, removing dead code (#5101)
7 years ago
Eugen Rochko cf7fbf2c56 Fix #5059 - Stop processing payload if it's from local account (#5100)
7 years ago
Eugen Rochko 91e5b0dfdb Send streaming API delete to people mentioned in status (#5103)
7 years ago
aschmitz 669fe9ee06 Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Akihiko Odaki bb4d005a83 Introduce OStatus::TagManager (#5008)
7 years ago
Eugen Rochko 41e6c8b151 Fix incomplete account records being read (#4998)
7 years ago
Eugen Rochko 09a94b575e Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
unarist 1eab53ee10 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979)
7 years ago
Akihiko Odaki 48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966)
7 years ago
ふぁぼ原 3816943e6b Enable to recognize most kinds of characters as URL paths (#4941)
7 years ago
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis 0c547faf92 Less gross passing of notifications flag
7 years ago
Surinna Curtis 6f7d00bfdd Add support for muting notifications in MuteService
7 years ago
Surinna Curtis 27f8d7069b block notifications in notify_service from hard muted accounts
7 years ago
Eugen Rochko 596dab06e9 Support OpenGraph video embeds (#4897)
7 years ago
ThibG af00220d79 Fix refollowing (#4931)
7 years ago
Eugen Rochko b9d241c6f5 Fix #4917 - Add missing suspend checks (#4921)
7 years ago
ThibG f29918e707 [WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907)
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
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 90712d4293 Fix errors preventing UnsubscribeService from working (#4866)
7 years ago
Eugen Rochko 9e15eeec63 Add missing reject_media check before avatar download via ActivityPub (#4862)
7 years ago
Eugen Rochko 4b460bc571 Fix #4852 - Check if already requested from FollowService (#4855)
7 years ago
Eugen Rochko 7ca173be47 Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861)
7 years ago
Eugen Rochko a4caa7eb62 Fetch statuses/following/followers numbers from ActivityPub collections (#4840)
7 years ago
Eugen Rochko e821c00e74 Fix mentions in direct statuses not being delivered via AP (#4806)
7 years ago
Eugen Rochko 9b50a9dd83 Fix some ActivityPub JSON bugs (#4796)
7 years ago
Eugen Rochko 37fdddd927 Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)
7 years ago
Eugen Rochko d3b6746173 Make "unfollow" undo pending outgoing follow request too (#4781)
7 years ago
Eugen Rochko 1b5806b744 Define missing JSON-LD properties (#4767)
7 years ago
Eugen Rochko 390bfec6da Avoid sending some ActivityPub payloads if the receiver will get them through distribution (#4739)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
unarist f7937d903c Don't process ActivityPub payload if signature is invalid (#4752)
7 years ago
James 6b2be5dbfb Guarantee Subscription service first account has proper URL details (#4732)
7 years ago
Eugen Rochko 7b8f262840 Forward ActivityPub creates that reply to local statuses (#4709)
7 years ago
Eugen Rochko 4c76402ba1 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
unarist 7876aed134 Fix deletion of status which has been reblogged (#4728)
7 years ago
Eugen Rochko 2a2698e450 Add ActivityPub serializer for Undo of Announce (#4703)
7 years ago
Eugen Rochko 00840f4f2e Add handling of Linked Data Signatures in payloads (#4687)
7 years ago
masarakki 649a20ab46 authorize-follow-requests-after-unlocking (#4658)
7 years ago
Eugen Rochko cf615abbf9 Add configuration to disable private status federation over PuSH (#4582)
7 years ago
unarist b01a19fe39 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
unarist 760cfe328f Fix accessing to XML attribute in FetchAtomService (#4668)
7 years ago
unarist 5927b43c0f Ignore empty response in ActivityPub::FetchRemoteStatusService (#4661)
7 years ago
unarist d63de55ef8 Fix bugs which OStatus accounts may detected as ActivityPub ready (#4662)
7 years ago
Eugen Rochko 72bb3e03fd Support more variations of ActivityPub keyId in signature (#4630)
7 years ago
Eugen Rochko 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
Eugen Rochko 6e9eda5331 ActivityPub migration procedure (#4617)
7 years ago
Eugen Rochko fe5b66aa08 Handle duplicate ActivityPub activities (#4639)
7 years ago
Yamagishi Kazutoshi 5f22c0189d Add support for searching AP users (#4599)
7 years ago
Eugen Rochko 26d26644ac Require "inbox" to be set on actor to be ActivityPub-ready (#4595)
7 years ago
Yamagishi Kazutoshi 96e9ed13de Fix search (regression from #4589) (#4594)
7 years ago
Eugen Rochko 4e75f0d889 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko ccdd5a9576 Add serializing/unserializing of "locked" actor attribute (#4585)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Yamagishi Kazutoshi 3e7a541e09 Change RuboCop rules to loose (#4464)
7 years ago
nullkal 6654c30033 Fix an error when a user tries to search nonexistent remote user (regression from #4275) (#4400)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
sdukhovni 06d905f415 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Ondřej Hruška 6913426e48 Merge pull request #92 from tootsuite/master
7 years ago
Eugen Rochko a929f7e6ac Fix #4172 - Mutes now block notifications (#4300)
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
Sorin Davidoi dcb9497148 fix(push_subscription): Guard against malformed favourite notification (#4271)
7 years ago
Eugen Rochko bbdcfd6baf Add ActivityPub attributes to accounts (#4273)
7 years ago
Akihiko Odaki f0d6550f16 Fix logging in ProcessFeedService (#4270)
7 years ago
Eugen Rochko 8400bee3b1 Refactor ResolveRemoteAccountService (#4258)
7 years ago
Eugen Rochko a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Akihiko Odaki 89b988cab5 Introduce Ostatus name space (#4164)
7 years ago
Sorin Davidoi 8387b3928e fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
ThibG 05cd37097c Optimize uri normalization (#4212)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Eugen Rochko e2685ccc81 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago