Convert `<DismissableBanner>` to Typescript (#25582)
Rewrite `<ShortNumber />` as FC and TS (#25492)
simplify counters (#25541)
Fix translate button position (#25807)
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Add button to see results for polls in web UI (#25726)
Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
Fix verified badge in account lists potentially including rel="me" links (#25561)
Change labels and styles on the onboarding screen in web UI (#25559)
Rewrite `<AutosuggestHashtag />` as FC and TS (#25481)
Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Rewrite `<LoadingIndicator/>` as FC and TS (#25364)
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Rewrite <LoadPending /> as FC and TS (#25363)
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.