Commit graph

7 commits

Author SHA1 Message Date
Claire
7f078e41c0 Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' 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.
2023-05-09 23:12:48 +02:00
Claire
43b38dc9e6 Copy hooks/useHovering.ts to glitch-soc 2023-05-09 21:30:10 +02:00
Claire
63c706d26f Merge commit 'b8d44c55fd9264cdacf66c32541b4343e164bbfb' 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.
2023-05-09 20:12:33 +02:00
Renaud Chaput
b640f89777 Rework polyfills loading (#24907) 2023-05-09 14:55:35 +02:00
たいち ひ
5f709b1601 Add TypeScript support for mastodon alias and image imports (#24895) 2023-05-08 11:28:36 +02:00
Plastikmensch
c33ecc00fa [Glitch] [Proposal] Make able to write React in Typescript (#2190)
Port 4866812b28 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-26 21:30:41 +02:00
fusagiko / takayamaki
4866812b28 [Proposal] Make able to write React in Typescript (#16210)
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00