Claire 7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.

2026-01-16 23:22:19 +01:00

..

actions

Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream

2026-01-16 22:28:08 +01:00

api

Display Wrapstodon inline widget (#37106)

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

api_types

Further clean up types for the card object (#37023)

2026-01-09 14:40:27 +00:00

components

Profile fields redesign (#37513)

2026-01-16 12:44:49 +00:00

containers

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

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

features

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

2026-01-16 23:22:19 +01:00

hooks

Account header split up (#37490)

2026-01-15 13:45:30 +00:00

locales

Profile fields redesign (#37513)

2026-01-16 12:44:49 +00:00

models

Further clean up types for the card object (#37023)

2026-01-09 14:40:27 +00:00

polyfills

Emoji: Fix Web Worker import (#36603)

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

reducers

Fix directory showing load more button when no more profiles exist (#37465)

2026-01-15 17:02:17 +00:00

selectors

Fix filters not applying to search results (#36346)

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

service_worker

Update ESLint to not try to resolve virtual modules (#34837)

2025-05-28 10:04:52 +00:00

store

Display Wrapstodon inline widget (#37106)

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

utils

Enable theming via new HTML element attributes (#37477)

2026-01-15 16:04:27 +00:00

api.ts

Add button to load new replies in web UI (#35210)

2025-07-23 13:42:07 +00:00

blurhash.ts

Change design of audio player in web UI (#34520)

2025-05-02 16:15:00 +00:00

common.ts

Replace Rails UJS library (#37031)

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

compare_id.ts

…

identity_context.tsx

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

initial_state.ts

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

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

is_mobile.ts

Change links in multi-column mode so tabs are open in single-column mode (#25893)

2023-07-13 17:18:09 +02:00

load_keyboard_extensions.js

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00

main.tsx

Emoji loading fixes (#37300)

2025-12-18 16:58:44 +00:00

permissions.ts

Add UI support for disabled live feeds (#36577)

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

ready.js

…

scroll.ts

Fix browser glitch caused by two overlapping scroll animations in web UI (#31960)

2024-09-19 10:52:46 +00:00

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

Update eslint (non-major) (#29820)

2024-04-03 18:05:39 +00:00