Claire 97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.

2025-12-18 18:10:30 +01:00

..

actions

Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream

2025-12-17 18:27:14 +01:00

api

Display Wrapstodon inline widget (#37106)

2025-12-03 13:58:38 +00:00

api_types

Update devDependencies (non-major) (#37074)

2025-12-15 12:53:21 +00:00

components

Fix custom emojis not displaying in CWs and fav/boost notifications (#37306)

2025-12-18 16:49:03 +00:00

containers

Update to latest eslint-plugin-react-hooks (#36702)

2025-11-10 14:50:04 +00:00

features

Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream

2025-12-18 18:10:30 +01:00

hooks

Wrapstodon: Allow dismissing banner (#37202)

2025-12-12 09:40:45 +00:00

locales

New Crowdin Translations (automated) (#37293)

2025-12-18 09:20:07 +00:00

models

Update devDependencies (non-major) (#37074)

2025-12-15 12:53:21 +00:00

polyfills

Emoji: Fix Web Worker import (#36603)

2025-10-27 17:36:01 +00:00

reducers

Wrapstodon: Load report data only on display (#37269)

2025-12-16 13:00:40 +00:00

selectors

Fix filters not applying to search results (#36346)

2025-11-27 16:23:11 +00:00

service_worker

…

store

Display Wrapstodon inline widget (#37106)

2025-12-03 13:58:38 +00:00

utils

Emoji: Import and use shortcode data (#37178)

2025-12-15 15:38:13 +00:00

api.ts

…

blurhash.ts

…

common.ts

Replace Rails UJS library (#37031)

2025-11-27 13:10:55 +00:00

compare_id.ts

…

identity_context.tsx

…

initial_state.ts

Wrapstodon: Load report data only on display (#37269)

2025-12-16 13:00:40 +00:00

is_mobile.ts

…

load_keyboard_extensions.js

…

main.tsx

Update devDependencies (non-major) (#37074)

2025-12-15 12:53:21 +00:00

permissions.ts

Add UI support for disabled live feeds (#36577)

2025-10-23 09:59:43 +00:00

ready.js

…

scroll.ts

…

settings.ts

Remember revealed archetype on future Wrapstodon visits (#37219)

2025-12-12 11:03:00 +00:00

stream.js

chore(deps): update dependency eslint-plugin-jsdoc to v60 (#36466)

2025-10-28 15:17:33 +00:00

uuid.ts

…