Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
about	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts	Fix being able to spoof link verification (#20217)	2022-11-09 08:24:21 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
admin_mailer	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
application	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
authorize_interactions	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
custom_css	Fix badge color not affected (#18826)	2022-07-19 01:06:11 +02:00
disputes/strikes	Fix incorrectly formatted datetime in account moderation note timestamp (#22555)	2023-01-05 13:35:28 +01:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2022-08-31 11:55:27 +02:00
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
following_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
home	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
invites	Remove invite comments from UI (#12068)	2019-10-03 22:37:13 +02:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
notification_mailer	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
oauth	Change visual separation of applications in authorized apps list (#17686)	2022-03-02 20:28:25 +01:00
privacy	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
settings	Add links to glitch-soc's Crowdin (#2033)	2022-12-21 23:49:08 +01:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
shares	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-28 11:33:34 +01:00
statuses_cleanup	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
tags	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
user_mailer	Remove unnecessary sections from welcome e-mail (#19299)	2022-10-06 00:03:52 +02:00
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00