monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 		2024-07-15 18:51:38 +02:00
..
__mocks__
…
entrypoints Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
flavours [Glitch] Add setting to disable hover cards 2024-07-12 13:50:42 +02:00
fonts
…
hooks Change hover cards to not appear until the mouse stops in web UI (#30850) 2024-07-01 15:52:01 +00:00
icons
…
images
…
mastodon Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 2024-07-15 18:51:38 +02:00
material-icons Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
skins
…
styles Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 2024-07-15 18:51:38 +02:00
svg-icons
…
types
…