mastodon/app/views/admin
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
..
account_moderation_notes Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
accounts Feature: add count of account notes to reports (#7130) 2018-04-17 14:58:11 +02:00
action_logs Add consumable invites (#5814) 2017-11-27 16:07:59 +01:00
change_emails Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
custom_emojis keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
domain_blocks
email_domain_blocks Fix style of email domain block table (#5218) 2017-10-04 18:16:30 +02:00
instances
invites Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
report_notes Feature: Improve reports ui (#7032) 2018-04-10 20:27:59 +02:00
reports Merge remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00
settings Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
statuses Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
subscriptions