about summary refs log tree commit diff
path: root/app/lib
AgeCommit message (Expand)Author
2018-07-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-10Make whole-word filter regex consistent between Ruby and JS (#7987)Eugen Rochko
2018-07-09Migrate glitch-soc keyword mutes to Mastodon'sThibaut Girka
2018-07-09Merge branch 'master' into glitch-soc/tentative-mergeThibaut Girka
2018-07-09Add option to not consider word boundaries when processing keyword filtering ...ThibG
2018-07-07Remove duplicate code for handling muted usersThibaut Girka
2018-07-06In keyword filter, account for reblogs, HTML and whole-words (#7960)Eugen Rochko
2018-07-05Check reblogged status for blocked/muted mentions (#7957)Eugen Rochko
2018-07-03Re-add follow recommendations API (#7918)Eugen Rochko
2018-06-29Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SER...MIYAGI Hikaru
2018-06-29Keyword/phrase filtering (#7905)Eugen Rochko
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-17Allow selecting default posting language instead of auto-detect (#7828)Eugen Rochko
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12keyword mute: use mentions scope in home feed filtering (#454)David Yip
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-08Do not accept ActivityPub follow requests from blocked user (#7756)Eugen Rochko
2018-06-03Thread scopes through #matches?. #454.David Yip
2018-06-02Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-31Exclude unlisted, private and direct toots from affecting trends (#7686)Eugen Rochko
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Fix N+1 on AtomSerializer (#7669)abcang
2018-05-28Record trending tags from ActivityPub, too (#7647)Eugen Rochko
2018-05-25Merge branch 'master' into glitch-soc/merge-masterThibaut Girka
2018-05-25Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)ThibG
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-18Resolve unknown status from Add activity, skip Remove if unknown (#7526)Eugen Rochko
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
2018-05-18Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-18User agent for WebFinger (#7531)MIYAGI Hikaru
2018-05-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-16Raise Mastodon::RaceConditionError if Redis lock failed (#7511)Akihiko Odaki
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-12Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)ThibG
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-10Disable inflate gzip on head method (#7432)Yamagishi Kazutoshi
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
2018-05-09Support gzip encoding on Request (#7425)Yamagishi Kazutoshi
2018-05-07If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398)Eugen Rochko
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko
2018-05-05Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)Eugen Rochko
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-04Store URIs of follows, follow requests and blocks for ActivityPub (#7160)Eugen Rochko
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-03Fixes/do not override timestamps (#7336)ThibG
2018-05-03Fixes/do not override timestamps (#7331)ThibG
2018-05-03Fix n+1 queries in StatusThreadingConcern (#7321)Eugen Rochko
2018-05-02Slightly reduce RAM usage (#7301)Eugen Rochko
2018-05-02Accept actor object updates from all supported actor types (#7312)ThibG