about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Expand)Author
2017-11-30Skins supportkibigo!
2017-11-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-30Fix too many forwards (#5854)Eugen Rochko
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-28Show "expired" in invite index (#5838)Yamagishi Kazutoshi
2017-11-28Allow hiding of reblogs from followed users (#5762)aschmitz
2017-11-28Fix account migration feature (#5837)nullkal
2017-11-27Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-27Add UI for setting up account migration (#5832)Eugen Rochko
2017-11-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-27Add consumable invites (#5814)Eugen Rochko
2017-11-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-25status: preserve visibility attribute when reblogging (infoleak fix) (#5789)William Pitcock
2017-11-24Fix unnecessary order (#5807)abcang
2017-11-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-24Add logging of admin actions (#5757)Eugen Rochko
2017-11-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-19Fix N+1 at notification (#5752)abcang
2017-11-19Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-19Add “staff” badge to admin user pages (#5735)Yamagishi Kazutoshi
2017-11-18Profile redirect notes (#5746)Eugen Rochko
2017-11-18Merge pull request #208 from yipdw/keyword-mutebeatrix
2017-11-17Update annotations on Follow, FollowRequest, and Mute.David Yip
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-17Display moderator badge (green), admin badge changed to red (#5728)Eugen Rochko
2017-11-16Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)ysksn
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Replace =~ with #matches?. #208.David Yip
2017-11-15Prefix cache keys with the matcher type. #208.David Yip
2017-11-15Match keyword mute filter on hashtags. #208.David Yip
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
2017-11-15Optional notification muting (#5087)Surinna Curtis
2017-11-14Add uniqueness to block email domains (#5692)Yamagishi Kazutoshi
2017-11-13Maintain case-insensitivity when merging multiple matchers (#213)David Yip
2017-11-12Update model annotations to use BIGINT for IDs (#5461)Daniel Hunsaker
2017-11-11Updates per code reviewaschmitz
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
2017-11-10Per-user reblog hiding implementation/fixes/testsaschmitz
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
2017-11-09Add and Remove tests for FollowRequest (#5622)ysksn
2017-11-07Twidere mention workaround (#5552)ThibG
2017-11-07Add ability to disable login and mark accounts as memorial (#5615)Eugen Rochko
2017-11-07 Show the local couterpart of emoji when it exists in /admin/custom_emojis (#...nullkal
2017-10-27Merge branch 'master' into gs-masterDavid Yip
2017-10-27Feature: Unlisted custom emojis (#5485)nullkal
2017-10-25Merge pull request #179 from glitch-soc/keyword-mutebeatrix