mastodon/app/views/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
account_moderation_notes
account_warnings
accounts Fix relationships page not showing results in admin UI (#12934) 2020-01-24 00:20:23 +01:00
action_logs
announcements Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +01:00
change_emails
custom_emojis Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows
domain_blocks
email_domain_blocks Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
instances Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
invites
pending_accounts
relationships Change followers page to relationships page in admin UI (#12927) 2020-01-23 20:33:20 +01:00
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
settings Fix issue because of theming system 2019-12-19 14:42:16 +01:00
statuses
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
warning_presets