Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
Fix being unable to load past a full page of filtered posts in Home timeline (#24930)
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Fix UI crash in moderation interface when opening the media modal (#24816)
Fix Onboarding Errors (#24883)
Change "Sign in" to "Login" (#24942)
Add stricter ESLint rules for Typescript files (#24926)
Enable ESLint react/no-deprecated (#24471)
Rewrite `logo.tsx` as FC (#24909)
Disable RTK safety middlewares (#24936)
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
We deleted it.
Kept it removed.
- `app/javascript/packs/public.jsx`:
Upstream changed an import, we have slightly different ones.
Ported upstream changes.
Add type annotation for DisplayName component (#24752)
Rename Image component to ServerHeroImage (#24894)
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream
Conflicts:
- `tsconfig.json`:
Upstream changed the config to properly process imports.
Glitch-soc had previously already done so.
Changed the config to better match upstream.
Use Prettier for ESLint formatting TypeScript (#23631)
Type Redux store and middleware (#24843)
Remove unused iOS agent sniffing function (#24931)