419 Commits (557db7ae6dbf757961b3834e4a4ac9435a97304c)

Author SHA1 Message Date
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
David Yip 22f9b4f2c0 Also filter notifications containing muted keywords.
7 years ago
David Yip 8d69329b8e keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
David Yip b2ad79547c Apply keyword mutes to reblogs.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip a3ee8592a8 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip ddcb129101 Spec out KeywordMute interface. #164.
7 years ago
beatrix eed9808f5f hide mentions of muted accounts (in home col) (#190)
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Eugen Rochko fef7c55bce When status is fetched instead of delivered, do not stream it (#5437)
7 years ago
aschmitz 4dbdda6b89 Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 7571d79c8d Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip c5888ff3a8 Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Eugen Rochko 8a276b4d43 Ensure that feed renegeration restores non-zero items (#5409)
7 years ago
unarist 1fa6d20981 Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 69b74d26cd Use atomUri in Undo activity of Announce (#5376)
7 years ago
Eugen Rochko ab9c76d786 Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago