Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
accounts	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
action_logs	Improve report layout (#7188)	2018-04-20 02:28:48 +02: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
dashboard	Fix tag usage display on admin dashboard	2018-07-16 19:51:16 +02:00
domain_blocks	Hide reject media checkbox when not relevant. (#8426)	2018-08-25 13:26:17 +02:00
email_domain_blocks	Fix style of email domain block table (#5218)	2017-10-04 18:16:30 +02:00
instances
invites	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays	Add federation relay support (#7998)	2018-07-13 02:16:06 +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-08-26 14:23:24 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
statuses	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
subscriptions
suspensions	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00