586 Commits (42cc93e8923a1b6cdb61574e9a86e360cba56abb)

Author SHA1 Message Date
Eugen Rochko 57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown (#7526)
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 4c0770d6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MIYAGI Hikaru 919eef3098 User agent for WebFinger (#7531)
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
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
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
Yamagishi Kazutoshi 6588f6a0a9 Disable inflate gzip on head method (#7432)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Yamagishi Kazutoshi edf882320a Support gzip encoding on Request (#7425)
7 years ago
Eugen Rochko 6208ea5a53
If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398)
7 years ago
Eugen Rochko 61a9018607
Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Eugen Rochko c947e2e4c5
Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)
7 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
7 years ago
David Yip da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a24605961a Fixes/do not override timestamps (#7336)
7 years ago
ThibG 581a5c9d29 Fixes/do not override timestamps (#7331)
7 years ago
Eugen Rochko a5293fdf61
Fix n+1 queries in StatusThreadingConcern (#7321)
7 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
7 years ago
ThibG d0cdd5cf94 Accept actor object updates from all supported actor types (#7312)
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
Eugen Rochko 705f1d7bf1
Fix missing updated_at attribute on emoji EntityCache (#7297)
7 years ago
Eugen Rochko 295e3ef02b
Fix missing domain attribute in EntityCache for emoji (#7290)
7 years ago
Eugen Rochko a872392cd9
Add entity cache (#7271)
7 years ago
MIYAGI Hikaru f58dcbc981 HTTP proxy support for outgoing request, manage access to hidden service (#7134)
7 years ago
Eugen Rochko 9d4710ed00
Add RSS feeds for end-users (#7259)
7 years ago
Eugen Rochko 7db7d68136
Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
7 years ago
Eugen Rochko 75c4ab9d12
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
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
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
Eugen Rochko b5726def55
Forward deletes on the same path as reply forwarding (#7058)
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
Jenkins f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG e573bb0990 Fix compatibility with PeerTube (#6968)
7 years ago
ThibG 9ed5eebd7c Do not ignore unknown media attachments, only skip them (#6948)
7 years ago
David Yip 1ed9500b52
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
7 years ago
Rey Tucker 21b586436e Remove ignored 'u' parameter on regexp (#392)
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 df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG ff6b8a6443 Serialize mentions in the order they are added (#6836)
7 years ago
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko f02411da40
Ignore media validation when attaching to status during processing (#6822)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MitarashiDango 6dcf96271e fix validation error (media only status) (#6684)
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
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
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e852872846
Fix #5708: Reject->Follow will remove the follow if it exists (#6571)
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
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 a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a71af98401
Push discovered status through streaming API within a time window (#6484)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip 53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
David Yip 29b5b46c87
Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki 0be9a1e321 Accept ActivityPub announce from the author of the original note (#6236)
7 years ago
codl 9abb5becf4
remove escapes from server-side γaml handler
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
ThibG b1e03197fa Process mentions and reblogs even from resolved threads (#6299)
7 years ago
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 35b84985a8
Skip ActivityPub Announces of non-public objects (#6230)
7 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 628358aeea Add the author of a status to cc if reblogged (#6226)
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
puckipedia 0eff42d688 Move Article from supported to converted types (#6218)
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
Eugen Rochko d60fd87e01
Don't leave behind husk of remotely-deleted profile (#6159)
7 years ago
Eugen Rochko 1419f656e2
Fix stats expiring too quickly because of variable mistake (#6155)
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 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki e0ef7f9d79 Fix XML oEmbed support discovery (#6104)
7 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3d3b403359
Do not hide statuses from silenced accounts from other silenced accounts (#6030)
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
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
kibigo! bdca1614d5 Screenshot support for themes
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
abcang 3caec1ecc2 Save media outside transaction (#5959)
7 years ago
cwm 7284e36fbd fixed fav setting change
7 years ago
cwm a489e5d5cd added a few more things
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
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
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! d216547382 Fixed typos
7 years ago
kibigo! 541fe9b110 Skins support
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
kibigo! bdbbd06dad Finalized theme loading and stuff
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
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
kibigo! 585758a373 Themed prefetching
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
Renato "Lond" Cerqueira ad207456d6 Improve language filter (#5724)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
David Yip 431503bae2 Also run the keyword matcher on a status' tags. #208.
7 years ago
aschmitz 9a42f7cbed Actually filter blocked reblogs from feed
7 years ago
MIYAGI Hikaru 782224c991 Avoid emojifying on invisible text (#5558)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
puckipedia 0cb329f63a Allow ActivityPub Note's tag and attachment to be single objects (#5534)
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
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 603cf02b70 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip 4745d6eeca Spec out KeywordMute interface. #164.
7 years ago
beatrix a7be86e875 hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
Eugen Rochko 484208ce12 When status is fetched instead of delivered, do not stream it (#5437)
7 years ago
aschmitz 554c2fd8af Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška 8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 34118169ac Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip 7e9d93472c Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Eugen Rochko 7cc71748ce Ensure that feed renegeration restores non-zero items (#5409)
7 years ago
unarist 6f490b4bfe Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 8125fdc19f Use atomUri in Undo activity of Announce (#5376)
7 years ago
Eugen Rochko df7dbc41ae Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)
7 years ago
Eugen Rochko b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Eugen Rochko 388d093beb When unfollowing, remove from home in web UI immediately (#5369)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko cfa68907ae Fix #5271 - Fix missing attribute in remove_from_feed (#5277)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
unarist d8b2f89d33 Fix remote profile being displayed in HTML on remote_follow (#5249)
7 years ago
Lynx Kotoura daa59dd454 Fix theme settings (#5242)
7 years ago
Eugen Rochko b9c76e2edb When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 63f0979799 Validate id of ActivityPub representations (#5114)
7 years ago
Daigo 3 Dango 01d6aa0397 Suppress backtrace from Request#perform (#5174)
7 years ago
Eugen Rochko f4ca116ea8 After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko d2f56d1cbc Change max redirects followed to 2 (#5136)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
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
kibigo! 86e617a839 Better themeing support!!
7 years ago
Eugen Rochko cf7fbf2c56 Fix #5059 - Stop processing payload if it's from local account (#5100)
7 years ago
Akihiko Odaki 98936bfcdf Add missing validations in ActivityPub::Activity::Create (#5096)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko 9c8e602163 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
ThibG 34fa305a00 Fix race condition when processing incoming OStatus messages (#5013)
7 years ago
Akihiko Odaki bb4d005a83 Introduce OStatus::TagManager (#5008)
7 years ago
Naoki Kosaka df1ce2350c Fix non-local statuses are html_encoded in public_page. (#5012)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko dce869dfc7 Define emoji context for ActivityPub (#5004)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist 17bf3363ac Add published property to ActivityPub activity for reblogs (#5000)
7 years ago
unarist 3f07f1b2b1 Raise an error on getting activity uri for remote status (#4984)
7 years ago
unarist ec36df97c4 Escape URL parts on formatting local status (#4975)
7 years ago
Akihiko Odaki 48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966)
7 years ago