about summary refs log tree commit diff
path: root/app/controllers
AgeCommit message (Expand)Author
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
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-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'David Yip
2017-11-19Add “staff” badge to admin user pages (#5735)Yamagishi Kazutoshi
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
2017-11-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-17Fix regression #5467: fixes emoji copy (#5739)Clworld
2017-11-16Themed prefetchingkibigo!
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Optional notification muting (#5087)Surinna Curtis
2017-11-15Filter searched toots to be consistent with blocking behaviors (#5383)ThibG
2017-11-14Add option to block direct messages from people you don't follow (#5669)Eugen Rochko
2017-11-11Updates per code reviewaschmitz
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
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-26Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-10-26Fix copying emojos: redirect to the page you were on (#5509)erin
2017-10-25Merge pull request #179 from glitch-soc/keyword-mutebeatrix
2017-10-25Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-d...David Yip
2017-10-24Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.David Yip
2017-10-24Use edit template for displaying errors in update.David Yip
2017-10-22Added a timeline for Direct statusesMatthew Walsh
2017-10-22Use current_account from ApplicationController.David Yip
2017-10-21Move KeywordMute into Glitch namespace.David Yip
2017-10-21Fill in create, edit, update, and destroy for keyword mutes interface.David Yip
2017-10-21Spike out index and new views for keyword mutes controller.David Yip
2017-10-21Set up /settings/keyword_mutes. #164.David Yip
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
2017-10-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-14Fix #5351 - Redirection with page params after copy emoji (#5387)KY
2017-10-13Fix UserTrackingConcern firing on every request, optimize some queries (#5368)Eugen Rochko
2017-10-13Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)Yamagishi Kazutoshi
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-10-10Fix custom emoji copy not copying file (#5298)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-08 17:34:19 +0000