1
0
puyopuyotetr.is/app/javascript
Claire f6654e0842 Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx`
2024-02-29 19:02:31 +01:00
..
__mocks__ Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
core Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream 2024-02-29 19:02:31 +01:00
flavours Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream 2024-02-29 19:02:31 +01:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01: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 commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
mastodon Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
material-icons [Glitch] Fix pixel alignment for some composer icons 2024-02-24 15:53:42 +01:00
packs Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream 2024-02-29 19:02:31 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
svg-icons Use active variants for boost icons and increase icon size (#27924) 2024-01-24 12:37:43 +00:00
types Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00