mastodon/app/javascript
Claire a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
2025-02-07 21:21:28 +01:00
..
__mocks__
entrypoints Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
flavours [Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji 2025-02-04 18:41:09 +01:00
fonts
hooks Add ability to dismiss alt text badge by tapping it in web UI (#33737) 2025-01-29 12:51:47 +00:00
icons
images Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 2025-01-21 19:23:25 +01:00
mastodon Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 2025-02-07 21:21:28 +01:00
material-icons Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 2025-01-27 18:19:09 +01:00
skins Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 2024-04-30 21:03:04 +02:00
styles Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
svg-icons Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
types Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00