monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
 		2022-03-02 20:48:27 +01:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours [Glitch] Add ability to mark statuses as sensitive from reports in admin UI 2022-03-02 18:08:56 +01:00
fonts
…
images
…
locales
…
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
skins
…
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00