Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex Port c9d06d10d4e936ee4f741ec2fecca7f91ca61997 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow Port 39110d1d0af5e3d9cf452ae47496a52797249fd0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `emoji_mart_data_light` as TS Port 3b5e302f7fc1e62cbd075e154ad9415f20fde2ce to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS (#25364) Port a86886b1fdc927ed51810fb6b43a0458bedf1cbb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Add missing report category translation Port 1cb4514d0e0ed349acbfe72ec87f3187a0cf613a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite <LoadPending /> as FC and TS Port dfaf59d99a2aa1f913608faee978bc3e1586a3ce to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Change "bot" label to "automated" Port 432a5d2d4bc307d9a9c7b484de96d3eb7926fa93 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
Fix non-interactive upload container being given a `button` role and tabIndex (#25462)
Fix always redirecting to onboarding in web UI (#25396)
Fix CAPTCHA page not following design pattern of sign-up flow (#25395)
Rewrite `emoji_mart_data_light` as TS (#25138)
Rewrite `<LoadingIndicator/>` as FC and TS (#25364)
Add missing report category translation (#25400)
[Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) Port 68a192e7186733885b1d70160170c4772fab7242 to glitch-soc Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
Rewrite <LoadPending /> as FC and TS (#25363)
Change "bot" label to "automated" (#25356)