glitchier-soc/app/javascript
Claire b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' 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.
2023-06-25 14:27:38 +02:00
..
core Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
flavours [Glitch] Fix non-interactive upload container being given a button role and tabIndex 2023-06-18 14:10:49 +02:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
packs Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
types Remove duplicate JPG type (#25054) 2023-05-22 12:46:20 +02:00