mastodon/app/controllers/admin
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
..
account_actions_controller.rb Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
account_moderation_notes_controller.rb
accounts_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
action_logs_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
announcements_controller.rb Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +01:00
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
custom_emojis_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
dashboard_controller.rb
domain_allows_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
invites_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
relationships_controller.rb Fix relationships page not showing results in admin UI (#12934) 2020-01-24 00:20:23 +01:00
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb Do not error out when performing admin actions on no statuses (#10094) 2019-02-21 19:36:48 +01:00
reports_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
resets_controller.rb
roles_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
settings_controller.rb
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
warning_presets_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00