Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
account_actions	…
account_warnings	…
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
announcements	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
change_emails	…
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
dashboard	…
disputes/appeals	…
domain_allows	…
domain_blocks	…
email_domain_blocks	…
export_domain_allows	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
export_domain_blocks	Add confirmation page when importing blocked domains (#1773)	2022-05-16 18:26:49 +02:00
follow_recommendations	…
instances	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
invites	…
ip_blocks	…
relationships	…
relays	…
report_notes	Fix error on attempting to delete an account moderation note (#18196)	2022-04-29 20:25:31 +02:00
reports	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
roles	Use type="color" on badge color input field (#18825)	2022-08-25 04:38:34 +02:00
rules	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
status_edits	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-17 22:07:20 +02:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
users/roles	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
warning_presets	…
webhooks	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00