You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/admin
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
account_moderation_notes
accounts Change admin accounts default sort to most recent (#8813) 7 years ago
action_logs
change_emails Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
custom_emojis Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
dashboard Fix tag usage display on admin dashboard 8 years ago
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
email_domain_blocks Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
instances
invites Add admin function to deactivate all invites (#8279) 8 years ago
relays Display pending message on admin relays UI (#8494) 8 years ago
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
settings Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
statuses Allow to show a specific status in the admin interface 8 years ago
subscriptions
suspensions Better singulars of account followers/toots. (#8471) 8 years ago