about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Expand)Author
2018-08-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-30Enforce username format for remote users, too (#8102)Eugen Rochko
2018-07-30Convert MOV and WEBM to MP4, raise maximum limit to 40MB (#8101)Eugen Rochko
2018-07-30Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge...Thibaut Girka
2018-07-28Redesign public profiles and toots (#8068)Eugen Rochko
2018-07-28Resize images by area instead of fixed dimensions (#8083)Eugen Rochko
2018-07-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-16Fix number of results returned from TrendingTags.getEugen Rochko
2018-07-16Display trending hashtags on admin dashboard (#8038)Eugen Rochko
2018-07-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-13Add federation relay support (#7998)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-07Add API method to remove a suggestion (#7978)Eugen Rochko
2018-07-06Add admin setting to enable OG previews for sensitive media (#7962)Eugen Rochko
2018-07-03Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)Renato "Lond" Cerqueira
2018-07-03Re-add follow recommendations API (#7918)Eugen Rochko
2018-06-29Keyword/phrase filtering (#7905)Eugen Rochko
2018-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-24Fix jpeg files sometimes being returned with a .jpe extension (#7881)ThibG
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