Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
about	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:49:42 +02:00
admin_mailer	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
application	Add image processing and generate blurhash for server thumbnail (#19348)	2022-10-13 11:29:19 +02:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
authorize_interactions	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
custom_css	Fix badge color not affected (#18826)	2022-07-19 01:06:11 +02:00
disputes/strikes	Fix ambiguous wording on appeal actions (#18328)	2022-05-06 21:41:34 +02:00
errors	…
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	…
kaminari	…
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
notification_mailer	Remove digest e-mails (#17985)	2022-08-25 23:38:22 +02: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	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02: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-10-28 19:23:58 +02: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