mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/javascript
History
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 		2024-05-01 19:30:41 +02:00
..
__mocks__ Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
flavours [Glitch] Fix incorrect label for filtered notifications badge 2024-05-01 19:18:06 +02:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
hooks
…
icons
…
images Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2024-03-19 19:21:12 +01:00
mastodon Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 2024-05-01 19:30:41 +02:00
material-icons Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
packs Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
skins Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 2024-04-30 21:03:04 +02:00
styles Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02: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