mastodon/app/views/admin
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
accounts Add "disable" button to report screen (#9024) 2018-10-20 02:39:39 +02:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
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 Fix tag usage display on admin dashboard 2018-07-16 19:51:16 +02: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 Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
statuses Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
suspensions Better singulars of account followers/toots. (#8471) 2018-08-26 21:30:53 +02:00