UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript
History
Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Minor upstream refactor moved hook definitions around,
  and glitch-soc has an extra `before_create`.
  Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
  Minor upstream refactor changed a block in which glitch-soc
  had one extra call to handle direct timelines.
  Adapted changes to keep glitch-soc's extra call.
 		2023-01-12 10:15:46 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
flavours [Glitch] Fix footer link circle dividers' screen reader accessibility by adding aria-hidden 2023-01-10 09:39:19 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales
…
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
packs Fix “Add new domain block” button using last submitted instead of current search value (#22485) 2023-01-05 13:42:38 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00