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 (#5757)	2017-11-24 02:05:53 +01:00
accounts_controller.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	2018-04-02 13:45:07 +02:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
confirmations_controller.rb	Add resend confirmation for admin (#7378)	2018-05-06 10:59:03 +02:00
custom_emojis_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb
report_notes_controller.rb	Feature: Improve reports ui (#7032)	2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
reports_controller.rb	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
resets_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
roles_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
settings_controller.rb
silences_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
statuses_controller.rb	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
subscriptions_controller.rb
suspensions_controller.rb
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00