Claire 8b568755ad 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.

2023-05-09 20:12:33 +02:00

..

core

Fix some more Javascript linting issues and discrepancies with upstream (#2209)

2023-05-07 21:43:25 +02:00

flavours

[Glitch] Fixes build errors from some previous TS-related commits

2023-05-08 22:15:00 +02:00

fonts

Merge branch 'main' into glitch-soc/merge-upstream

2022-10-28 19:23:58 +02:00

hooks

[Proposal] Make able to write React in Typescript (#16210)

2023-04-03 03:31:39 +02:00

icons

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00

images

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

locales

Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)

2023-04-08 14:11:40 +02:00

mastodon

Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream

2023-05-09 20:12:33 +02:00

packs

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-22 10:06:11 +02:00

skins

initial translation of Glitch-specific texts into Czech (#1997)

2022-12-08 10:38:52 +01:00

styles

Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream

2023-05-08 19:28:21 +02:00

types

Add TypeScript support for mastodon alias and image imports (#24895)

2023-05-08 11:28:36 +02:00