Fixes issues with the JS for at least sign-up pages not working

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Borders in blockquotes in reply-indicator weren't colored properly.

avatar margin when viewing edited toots dropdown was applied to wrong side.

Conversations had padding applied to the wrong side.

Padding for notifcation cleaner checkboxes was applied to wrong side.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

…2190)

Port 4520e64 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.

Port c1a7e38 to glitch-soc

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

…ector 15 (text)

Port 37886c2 to glitch-soc

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

Port fbb4de3 to glitch-soc

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

Port e713c54 to glitch-soc

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

…e more visible

Port e1b4eeb to glitch-soc

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

… web UI

Port 7cf963e to glitch-soc

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

Port 290e4ab to glitch-soc

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

…n#24653)

Port 1527b02 to glitch-soc

Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Port 105f868 to glitch-soc

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

Port 2daa5a1 to glitch-soc

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

Port 6028d04 to glitch-soc

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

…-soc translations

…upstream

Merge upstream changes

* New translations en.json (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons

* Run stylelint --fix

* Avoid `@extend` directives with doodle modal CSS

* Drop use of `@extend` for notification cleanup buttons SCSS

* Run prettier on SCSS

…ed divergences with upstream (mastodon#2208)

* Run eslint --fix

* Fix linting issues in video player and reduce divergences with upstream

This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.

* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`

Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.

* Fix linting issue and bug in streaming/index.js

* Fix linting issues in config/webpack/shared.js

* Fix unused import in flavours/glitch/features/ui/index.js

* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx

* Fix linting issues in flavours/glitch/reducers

* Fix linting issues in glitch-soc onboarding modal

* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx

* Remove dead code for unused local setting navbar_under

* Fix various linting issues

* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream

When cancelling a reply, the language was still set to the language of the replied to toot.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

…ed (mastodon#2210)

…am (mastodon#2209)

* Fix typo in flavours/glitch/features/video/index.js

* Fix various linting issues and discrepancies with upstream

* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`

This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.

* Fix missing /privacy-policy link in DM warning because of wrongly-named import

* Fix unnecessary import

* Fix regexp in flavours/glitch/utils/hashtag.js

* Fix uses of intl.formatMessages without default messages

* Ignore lint issue for ColumnLink button

…oc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

Port bfeccf6 to glitch-soc

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

Port f22b4e5 to glitch-soc

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

Port cf1bc4b to glitch-soc

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

Port 24b2c60 to glitch-soc

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

Port 81f75b1 to glitch-soc

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

Port 15fd712 to glitch-soc

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

Port f1c1fa1 to glitch-soc

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

Port 0ad2413 to glitch-soc

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

…upstream

Merge upstream changes

Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.

…oc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.

Port 5a5975d to glitch-soc

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

Port f501057 to glitch-soc

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

Port d37c0a1 to glitch-soc

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

…e height themselves

Port 598e63d to glitch-soc

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

Port 8131a5b to glitch-soc

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

…f redux

Port 8227af8 to glitch-soc

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

Port 9c1929e to glitch-soc

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

Port e38b391 to glitch-soc

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

Port 9a52a7f to glitch-soc

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

…reateAction

Port 0999cb4 to glitch-soc

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

Port 45579a2 to glitch-soc

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

…upstream

Merge upstream changes

…oc/merge-upstream

Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.

Port 490ccbf to glitch-soc

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

Port a65d2d1 to glitch-soc

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

Port 76264e3 to glitch-soc

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

Port 5bc8e2d to glitch-soc

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

Port 9818f34 to glitch-soc

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

Port 89269e4 to glitch-soc

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

Port 7c1305b to glitch-soc

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

…oc/merge-upstream

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.

Port 955179f to glitch-soc

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

Port d9b93bd to glitch-soc

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

Port c8181eb to glitch-soc

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

…oc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.

Port 6579e3a to glitch-soc

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

Port a3a2414 to glitch-soc

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

Port 224d458 to glitch-soc

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

Port 6aeb162 to glitch-soc

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

…oc/merge-upstream

Port 51b83ed to glitch-soc

…upstream

Merge upstream changes

…odon#2222)

…orm (mastodon#2226)

Fixes mastodon#2220

This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.

This also brings us slightly closer to upstream.

…ggestion) (mastodon#2231)

Fix regression from mastodon#2156

…oc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.

Port ab7716c to glitch-soc

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

Port 349cae0 to glitch-soc

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

Port 6f8db56 to glitch-soc

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

Port b878e3d to glitch-soc

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

Port 5eeb40b to glitch-soc

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

Port 0eed060 to glitch-soc

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

Port 3869e8c to glitch-soc

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

…modal

Port 5241f7b to glitch-soc

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

…in Home timeline

Port 7b54e47 to glitch-soc

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

…oc/merge-upstream