Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +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	…
dashboard	Add instance-wide setting to disable profile directory (#9497)	2018-12-11 19:18:29 +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	Fix “reset” button of instance filter switching to custom emoji admin panel (#10076)	2019-02-19 14:01:22 +01:00
invites	Improve invites list with click-to-copy inputs (#10259)	2019-03-14 05:25:49 +01:00
relays	…
report_notes	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
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-14 17:17:20 +01:00
statuses	Add quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
subscriptions	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00
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