134 Commits (dcc1c10937f0e8851c26a2b59873da819137e5fa)

Author SHA1 Message Date
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
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
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
Rey Tucker 36b5703796 request: in the event of failure, try other IPs (#6761) (#6813)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e6520c0270
Fix #6657 - Use target instead of origin in Remove activity (#6664)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Eugen Rochko 44829d8216
Fix missing focalPoint in ActivityPub JSON (#6609)
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
Akihiko Odaki 2e8a492e88 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Jenkins 2edf7128f2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki f8f0572ee0 Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
Jenkins 544543e40a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 7124881273 Improve performance of feed_manager_spec (#6517)
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
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 fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG a8b51124ba Don't normalize URLs in toots (#6134)
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 545095b3ce [!] Sanitize incoming classlist properly (#6162)
7 years ago
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 85e97ecab6
Fix too many forwards (#5854)
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
ysksn 8f638a2bf2 Add a test for Settings::Extend#settings (#5720)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
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
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
David Yip 431503bae2 Also run the keyword matcher on a status' tags. #208.
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
aschmitz 9a42f7cbed Actually filter blocked reblogs from feed
7 years ago
David Yip d03b48cea0 Also filter notifications containing muted keywords.
7 years ago
David Yip 19826774f0 keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
beatrix a7be86e875 hide mentions of muted accounts (in home col) (#190)
7 years ago
aschmitz 554c2fd8af Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Eugen Rochko 34118169ac Keep references to all reblogs of a status on home feed (#5419)
7 years ago