Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +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	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
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-03-14 16:44:35 +01: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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
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
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
instances	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01: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	Add appeals (#17364)	2022-02-14 21:27:53 +01: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	Fix description of “Allow posts with Content Warnings to trend” setting	2022-03-24 09:49:15 +01: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-03-15 20:45:27 +01:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00