Claire 06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.

2025-06-02 20:05:43 +02:00

..

action_bar.tsx

Add endorsed accounts to profiles in web UI (#34568)

2025-04-29 12:14:22 +00:00

autosuggest_account.jsx

…

character_counter.tsx

…

compose_form.jsx

…

edit_indicator.jsx

…

emoji_picker_dropdown.jsx

Fix emoji bundle size (#34677)

2025-05-14 06:39:05 +00:00

language_dropdown.tsx

…

navigation_bar.jsx

…

poll_button.jsx

…

poll_form.jsx

…

privacy_dropdown.jsx

Refactor <ActionsModal> to TypeScript (#34559)

2025-04-28 11:43:42 +00:00

reply_indicator.jsx

…

search.tsx

Fix nested buttons in search popout in web UI (#34871)

2025-06-02 12:21:31 +00:00

text_icon_button.jsx

…

upload_button.jsx

…

upload_form.tsx

…

upload_progress.tsx

Fix bugs with upload progress (#34325)

2025-03-31 21:05:09 +00:00

upload.tsx

…

warning.tsx

Fix incorrect locked account warning in composer (#34312)

2025-03-29 18:06:46 +00:00