~cytrogen/masto-fe

3fb7fe14 — Claire 2 years ago
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#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
9b597486 — Claire 2 years ago
Fix rubocop warnings (#2206)

6f64c79c — Claire 2 years ago
Fix SCSS linting issues (#2207)

* 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
a6207d24 — Claire 2 years ago
New Crowdin updates (#2202)

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

* New translations en.json (Russian)
[ci skip]
c18884de — Claire 2 years ago
Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
e79998a1 — Claire 2 years ago
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
38eeed6c — Eugen Rochko 2 years ago
[Glitch] Change logo version in header based on screen size in web UI

Port 6028d047b9f7d14b2617f47b51f6098f686b1b4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10335984 — Nick Schonning 2 years ago
[Glitch] Enable formatjs/prefer-pound-in-plural

Port 2daa5a1549f0c954e9d5f2c073ac32454a4c50fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
edec08b9 — Claire 2 years ago
Disable full-width media in thread view
cb97a929 — Claire 2 years ago
[Glitch] Fix thread lines in right-to-left locales (#24714)

Port 105f8687e465a7b3f9188c4959ecc1d858afee66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
103b6de8 — Claire 2 years ago
[Glitch] Fix sass warning about deprecated slash as division (#24653)

Port 1527b02c6d7b542dfdfab41e55b8b8b437c8c46f to glitch-soc

Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7b01b7c3 — Eugen Rochko 2 years ago
[Glitch] Add lines to threads in web UI

Port 290e4aba3167b282c9ee1e966c840a490b7c818b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
8015297f — Eugen Rochko 2 years ago
[Glitch] Change label from "For you" to "People" on explore screen in web UI

Port 7cf963eec243e512e5db716467bb27e549cf46aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
374a1095 — Chike Nwaenie 2 years ago
[Glitch] Change styling of the recommended accounts to allow bio to be more visible

Port e1b4eeb6367e0f4af64ed739ba20c9762dce43f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
0091b28f — Christian Schmidt 2 years ago
[Glitch] Use CSS to trim long card descriptions

Port e713c545b89ec86742161775b834c7f56d4377c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11b34a90 — Claire 2 years ago
[Glitch] Fix infinite loop in emoji replacement code

Port fbb4de3dbc39e3874a257b37c5c5104e1f887c86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
0a813d96 — Claire 3 years ago
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)

Port 37886c28da55c0e62cc9dbb24fb14c02b3789d0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
66bda471 — fusagiko / takayamaki 3 years ago
[Glitch] Allow `==` when null checking

Port c1a7e38d2b9504fe06716a56a1f6193686026c16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
612a1ee6 — Claire 2 years ago
Fix `body_classes` test for glitch-soc
12b935fa — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

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.
Next