1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 22:59:46 +09:00
YuruToot/app/javascript
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
2023-12-17 23:04:16 +01:00
..
__mocks__ Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
core Fix @rails/ujs imports 2023-10-24 20:23:31 +02:00
flavours [Glitch] Fix inserting emojis from emoji picker fails with TypeError 2023-12-17 18:03:22 +01: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 commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
packs Fix @rails/ujs import on public.jsx (#2482) 2023-11-24 17:40:31 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
types Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00