Claire 59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.

2026-02-05 12:43:12 +01:00

..

actions

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

2026-02-03 15:44:04 +01:00

api

Implement editing collection settings and deleting collections (#37658)

2026-01-29 11:01:40 +00:00

api_types

Split collection editor into dedicated routes (#37731)

2026-02-04 17:45:41 +00:00

components

Split collection editor into dedicated routes (#37731)

2026-02-04 17:45:41 +00:00

containers

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

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

features

Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream

2026-02-04 19:23:24 +01:00

hooks

Profile redesign: Fields iteration (#37682)

2026-02-03 13:02:33 +00:00

locales

New Crowdin Translations (automated) (#37740)

2026-02-05 10:08:56 +00:00

models

Profile redesign: Follow button and menu reorg (#37707)

2026-02-03 11:33:20 +00:00

polyfills

Emoji: Fix Web Worker import (#36603)

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

reducers

Implement editing collection settings and deleting collections (#37658)

2026-01-29 11:01:40 +00:00

selectors

Profile redesign: Featured tags (#37645)

2026-01-29 09:01:36 +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

Profile redesign: Fields iteration (#37682)

2026-02-03 13:02:33 +00:00

api.ts

Improve apiRequest helper types (#37544)

2026-01-20 11:04:06 +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

…

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