Glitch-Shrike/app/javascript/mastodon
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
..
actions Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
api_types
components Change media “ALT” label to a specific class (#28777) 2024-01-17 15:32:56 +00:00
containers
features Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
locales Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
models
polyfills
reducers Update devDependencies (non-major) (#28728) 2024-01-16 18:34:22 +00:00
selectors Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
service_worker
store Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
utils
api.ts
blurhash.ts
common.js
compare_id.ts
initial_state.js Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 2023-12-17 17:43:30 +01:00
is_mobile.ts
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts
ready.js
scroll.ts
settings.js
stream.js
test_helpers.tsx
test_setup.js
uuid.ts