Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +01: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-12-15 20:25:25 +01: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	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	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
export_domain_allows	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
export_domain_blocks	Fix issue with glitch-soc theming	2022-12-15 20:30:46 +01:00
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
instances	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +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 IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes	Fix incorrectly formatted datetime in account moderation note timestamp (#22555)	2023-01-05 13:35:28 +01:00
reports	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
roles	Use type="color" on badge color input field (#18825)	2022-08-25 04:38:34 +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	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-11 20:15:04 +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	2023-01-12 10:15:46 +01:00
users/roles	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00
webhooks	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00