masto-fe/app/views/admin
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
account_moderation_notes Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
accounts Display deleted users' role as “Suspended” (#6080) 2017-12-22 02:14:17 +01:00
action_logs Add consumable invites (#5814) 2017-11-27 16:07:59 +01: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 Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
email_domain_blocks Fix style of email domain block table (#5218) 2017-10-04 18:16:30 +02:00
instances Add instance search feature (#4925) 2017-09-13 12:30:07 +02:00
invites Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
reports Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
settings Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
statuses Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00