Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02: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	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +02: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
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
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
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
relays
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
warning_presets	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00