540 Commits (a68d1d0ee2739269b2f9182b9a8ac53ea3b38eca)

Author SHA1 Message Date
Eugen Rochko adeb99bc8c Record trending tags from ActivityPub, too (#7647)
7 years ago
Thibaut Girka 4cb367e6d4 Merge branch 'master' into glitch-soc/merge-master
7 years ago
ThibG d1b2466320 Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1de7400dfc Resolve unknown status from Add activity, skip Remove if unknown (#7526)
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 4a3872d26e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MIYAGI Hikaru 7dbf83d6b8 User agent for WebFinger (#7531)
7 years ago
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki 5dadb6896b Raise Mastodon::RaceConditionError if Redis lock failed (#7511)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 74c2a46423 Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Yamagishi Kazutoshi 59b48b923d Disable inflate gzip on head method (#7432)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Yamagishi Kazutoshi 1b42ea9f2c Support gzip encoding on Request (#7425)
7 years ago
Eugen Rochko 244a270a80 If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398)
7 years ago
Eugen Rochko 4055ce490c Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Eugen Rochko ef1a273322 Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)
7 years ago
David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 154076e8e7 Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
7 years ago
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG f2ecedaab5 Fixes/do not override timestamps (#7336)
7 years ago
ThibG 9c1e1005f4 Fixes/do not override timestamps (#7331)
7 years ago
Eugen Rochko 92c5474861 Fix n+1 queries in StatusThreadingConcern (#7321)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
ThibG 616cfab97c Accept actor object updates from all supported actor types (#7312)
7 years ago
Eugen Rochko c5fa8041c2 Remove most behaviour disparities between blocks and mutes (#7231)
7 years ago
Eugen Rochko 192746ec3e Guard against nil URLs in Request class (#7284)
7 years ago
Surinna Curtis 72793b3fc7 Support Actors/Statuses with multiple types (#7305)
7 years ago
Eugen Rochko 62a50fcc75 Fix missing updated_at attribute on emoji EntityCache (#7297)
7 years ago
Eugen Rochko aa54b99f3f Fix missing domain attribute in EntityCache for emoji (#7290)
7 years ago
Eugen Rochko 1a653fff95 Add entity cache (#7271)
7 years ago
MIYAGI Hikaru 28808f638e HTTP proxy support for outgoing request, manage access to hidden service (#7134)
7 years ago
Eugen Rochko 24330e4fa7 Add RSS feeds for end-users (#7259)
7 years ago
Eugen Rochko 39f36c0901 Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
7 years ago
Eugen Rochko 599aa39aca Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
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
Eugen Rochko 608b4096ea Forward deletes on the same path as reply forwarding (#7058)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 44274257de [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
Jenkins 658440838b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 1cda8b247a Fix compatibility with PeerTube (#6968)
7 years ago
ThibG f7a96189b6 Do not ignore unknown media attachments, only skip them (#6948)
7 years ago
David Yip e6e537d002 Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
7 years ago
Rey Tucker b65fc60334 Remove ignored 'u' parameter on regexp (#392)
7 years ago
David Yip 7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki acece7a2e6 Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 11c19f6cc9 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Rey Tucker 4c91be94d3 request: in the event of failure, try other IPs (#6761) (#6813)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 99790407e2 Serialize mentions in the order they are added (#6836)
7 years ago
David Yip b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko f0bc8e8a89 Ignore media validation when attaching to status during processing (#6822)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MitarashiDango 894226c288 fix validation error (media only status) (#6684)
7 years ago
Eugen Rochko 0c2a08adeb Remove text requirement when media attached from statuses (#6672)
7 years ago
Eugen Rochko 29f412da2c Fix #6657 - Use target instead of origin in Remove activity (#6664)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 5f70533e8a Fix #5708: Reject->Follow will remove the follow if it exists (#6571)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Jenkins b4f099ac0a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7ac6e09dde Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
David Yip e365675e0a Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki 3cd3cae7f7 Accept ActivityPub announce from the author of the original note (#6236)
7 years ago
codl 2710843f69 remove escapes from server-side γaml handler
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
ThibG dc4054abe9 Process mentions and reblogs even from resolved threads (#6299)
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e19ece354e Skip ActivityPub Announces of non-public objects (#6230)
7 years ago
Jenkins f9a0b246e5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 74e427c24b Add the author of a status to cc if reblogged (#6226)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins f10ce3f003 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d4e0d2563c Fix bad URL schemes being accepted (#6219)
7 years ago
puckipedia 4ae7b4eb1e Move Article from supported to converted types (#6218)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 5ee5272b69 Don't normalize URLs in toots (#6134)
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 95adc48b92 [!] Sanitize incoming classlist properly (#6162)
7 years ago
Eugen Rochko 48bc0b8375 Don't leave behind husk of remotely-deleted profile (#6159)
7 years ago
Eugen Rochko cb45282e47 Fix stats expiring too quickly because of variable mistake (#6155)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip f722fcb5a6 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki d8a0c19166 Fix XML oEmbed support discovery (#6104)
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 99a208cd8f Do not hide statuses from silenced accounts from other silenced accounts (#6030)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 8c04f9417f Fix redundant HTTP request in FetchLinkCardService (#6002)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
kibigo! a1c79ef544 Screenshot support for themes
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
abcang a55211ee5b Save media outside transaction (#5959)
7 years ago
cwm 98815c76ce fixed fav setting change
7 years ago
cwm 7ff586054c added a few more things
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
kibigo! cc70ca9b76 Fixed typos
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cfe67ba832 Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 2421fd745a Fix too many forwards (#5854)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
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
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Renato "Lond" Cerqueira f366a83c6c Improve language filter (#5724)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 2c6a2d588c Match keyword mute filter on hashtags. #208.
7 years ago
David Yip dd29a41b61 Also run the keyword matcher on a status' tags. #208.
7 years ago
aschmitz 3fe59e7d97 Actually filter blocked reblogs from feed
7 years ago
MIYAGI Hikaru 3506668438 Avoid emojifying on invisible text (#5558)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
puckipedia 2c06b21883 Allow ActivityPub Note's tag and attachment to be single objects (#5534)
7 years ago