Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

[Glitch] Add colour to follow button when hashtag is being followed

Port 77bd32a26abbf8b49caf35dcdf170e312e48a277 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge branch 'main' into glitch-soc/merge-upstream

Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Add colour to follow button when hashtag is being followed (#24361)

New Crowdin updates (#24276)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Move ESLint configs to overrides (#24370)

[Proposal] Make able to write React in Typescript (#16210)

Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>

Merge branch 'main' into glitch-soc/merge-upstream

Change search pop-out in web UI (#24305)

Fix regressions from change in account row design in web UI (#24343)

[Glitch] Fix: set multiColumn value for /explore Statuses

Port 74f56c64fc0aa0dce0dc2c267aa8a212569e9673 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Move marky to devDependency

Port ddb769f0b84d4bcff22472f236a4ec74c631d0a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.

Change "direct message" nomenclature to "private mention" in web UI (#24248)

Fix: set multiColumn value for /explore Statuses (#24314)

Move marky to devDependency (#24258)

New Crowdin updates (#24130)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Merge pull request #2151 from ClearlyClaire/glitch-soc/main

Merge upstream changes

Refactor styles to use logical properties for positioning (#23944)