mastodon-glitch/app/controllers/admin
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
account_moderation_notes_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
accounts_controller.rb Implement the ability for an Administrator or Moderator to remove an account avatar () 2018-04-02 13:45:07 +02:00
action_logs_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
base_controller.rb Add “public” pack to admin controller, as it is included in upstream admin layout 2018-03-30 18:16:47 +02:00
change_emails_controller.rb Feature: Allow staff to change user emails () 2018-04-10 09:16:06 +02:00
confirmations_controller.rb Add resend confirmation for admin () 2018-05-06 10:59:03 +02:00
custom_emojis_controller.rb keep the same filters and page when doing custom emojo stuff (fixes ) () 2017-12-30 02:43:43 +01:00
domain_blocks_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
email_domain_blocks_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
instances_controller.rb Add moderator role and add pundit policies for admin actions () 2017-11-11 20:23:33 +01:00
invites_controller.rb Add invite filter () 2017-12-01 16:40:02 +01:00
report_notes_controller.rb Feature: Improve reports ui () 2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb Improve admin UI for accounts () 2018-05-05 23:06:29 +02:00
reports_controller.rb Improve report layout () 2018-04-20 02:28:48 +02:00
resets_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
roles_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
settings_controller.rb Redesign landing page (again) () 2018-02-22 01:03:48 +01:00
silences_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
statuses_controller.rb Improve admin UI for accounts () 2018-05-05 23:06:29 +02:00
subscriptions_controller.rb Add moderator role and add pundit policies for admin actions () 2017-11-11 20:23:33 +01:00
suspensions_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
two_factor_authentications_controller.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00