mastodon/app/views/admin
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
account_actions Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_moderation_notes
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
action_logs
change_emails Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
custom_emojis Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
dashboard Add instance-wide setting to disable profile directory (#9497) 2018-12-11 19:18:29 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
email_domain_blocks Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
instances Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
invites
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
settings Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
statuses Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
subscriptions
tags Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
warning_presets Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00