Claire 0845bee8d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
account_actions	Add inline description of moderation actions in moderation interface (#15792)	2021-02-24 16:53:16 +01:00
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
account_warnings	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
announcements	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	2019-09-13 20:28:22 +02:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +01:00
email_domain_blocks	Fix some ignored brakeman warnings (#15829)	2021-03-07 07:06:56 +01:00
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
instances	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
relationships	Fix error on account relationships page in admin UI (#17444)	2022-02-05 05:06:34 +01:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
reports	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
rules	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
settings	Change CAPTCHA handling to be only on email verification	2022-01-25 23:56:57 +01:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00