monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 		2025-02-05 18:21:36 +01:00
..
__mocks__ Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
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 Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
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 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 2025-02-05 18:21:36 +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