Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
account_actions	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_moderation_notes
account_warnings	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
action_logs
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	2019-02-05 15:11:35 +01:00
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
dashboard	Change icons of features on admin dashboard to remove bias (#10366)	2019-03-26 01:24:19 +01:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
email_domain_blocks	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
followers	Fix admin UI view of local followers (#9712)	2019-01-04 11:28:14 +01:00
instances	Improve performance of list of blocked domains by caching counts (#10374)	2019-03-26 00:36:35 +01:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:01:59 +01:00
statuses	Add quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
subscriptions
tags	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
warning_presets	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00