Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
account_actions	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
account_warnings	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
announcements
change_emails	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
disputes/appeals	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
domain_allows
domain_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-10 09:52:45 +01:00
email_domain_blocks	Adapt view for glitch-soc's theming system	2022-02-26 09:46:13 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
instances	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
invites
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
relationships	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
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-03-28 16:22:28 +02:00
rules	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
settings	Make “Flavour and skin” admin setting label translatable (#1791)	2022-05-31 16:52:52 +02:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
warning_presets
webhooks	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00