about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Expand)Author
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-18Create special case to prefer "jpeg" over "jpe" file extension (#7841)Eugen Rochko
2018-06-17Allow selecting default posting language instead of auto-detect (#7828)Eugen Rochko
2018-06-17Change language opt-out to language opt-in (#7823)Eugen Rochko
2018-06-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-15Add autofollow option to invites (#7805)Eugen Rochko
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-...David Yip
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-09Fix has_one association on Web::PushSubscription (#7767)Eugen Rochko
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-06-06Filter out blocked/muted people from profile timelines (#7747)Eugen Rochko
2018-06-06Fix fetch of remote image with multiple Content-Type headers (#7749)Yamagishi Kazutoshi
2018-06-06Add missing dot for remote image (#7751)Yamagishi Kazutoshi
2018-06-05Merge pull request #534 from glitch-soc/restructure-kw-as-word-listsDavid Yip
2018-06-05Escape metacharacters in non-whole-word keyword mutes. Fixes #533.David Yip
2018-06-05Add redraft function (#7735)Eugen Rochko
2018-06-04Merge pull request #530 from glitch-soc/restructure-kw-as-word-listsDavid Yip
2018-06-04Fix context performance by partially reverting #7083 (#7734)nightpool
2018-06-04Detect extname from Content-Type (#7733)Yamagishi Kazutoshi
2018-06-03Thread scopes through #matches?. #454.David Yip
2018-06-04Do not mark remote status sensitive even if spoiler text is present (#7395)Akihiko Odaki
2018-06-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-04Remove trending hashtags (#7711)Eugen Rochko
2018-06-03keyword mute: Store keywords as a listDavid Yip
2018-06-02Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-01Use different algorithm for trending tags (#7697)Eugen Rochko
2018-05-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-30Improve counter caches on Status and Account (#7644)Eugen Rochko
2018-05-29Reduce wasted work in RemoveStatusService due to inactive followers (#7672)Eugen Rochko
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Rescue Mastodon::DimensionsValidationError in Remoteable (#7662)Eugen Rochko
2018-05-28optimize direct timeline (#7614)tateisu
2018-05-27Track trending tags (#7638)Eugen Rochko
2018-05-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-27Validate that e-mail resolves with MX and it's not blacklisted (#7631)Eugen Rochko
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-19Ensure push subscription is immediately removed when application is revoked (...Eugen Rochko
2018-05-19Improve payload format of Web Push API now that it's open (#7521)Eugen Rochko
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-13Fix nil error in StatusFilter (#7470)Eugen Rochko
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-11Catch Paperclip processing failures (fixes #6378) (#7439)ThibG
2018-05-11Add REST API for Web Push Notifications subscriptions (#7445)Eugen Rochko
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
2018-05-08Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-05-07Bot nameplates (#7391)Eugen Rochko
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko