~cytrogen/masto-fe

ref: b735954971a3e191fbfa1860e871724fafb9363d masto-fe/app/javascript/mastodon/locales d---------
b7359549 — Claire 2 years ago
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
52d36f0f — Steven Munn 2 years ago
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959)

Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3869e8c2 — Eugen Rochko 2 years ago
Change "Sign in" to "Login" (#24942)

5eeb40bd — Renaud Chaput 2 years ago
Add stricter ESLint rules for Typescript files (#24926)

61f3e0e9 — Claire 2 years ago
Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
2d029ded — Claire 2 years ago
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/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.
c18884de — Claire 2 years ago
Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
0a08e9d3 — Eugen Rochko 2 years ago
New Crowdin updates (#24678)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
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.
8979b709 — Eugen Rochko 2 years ago
Add default post text to onboarding flow in web UI (#24705)

7cf963ee — Eugen Rochko 2 years ago
Change label from "For you" to "People" on explore screen in web UI (#24706)

d4511f2a — Eugen Rochko 2 years ago
New Crowdin updates (#24617)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
c35e3cb6 — Eugen Rochko 2 years ago
Add more tips to onboarding flow in web UI (#24646)

2daa5a15 — Nick Schonning 2 years ago
Enable formatjs/prefer-pound-in-plural (#24622)

ef3675d6 — Nick Schonning 2 years ago
Remove empty Kushubian (csb) local files (#24151)

0461f833 — Eugen Rochko 2 years ago
Add new onboarding flow to web UI (#24619)

2ebbfebf — Claire 2 years ago
Merge pull request #2192 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
9d75b03b — Eugen Rochko 2 years ago
New Crowdin updates (#24517)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
abfdafef — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
f30c5e7f — Claire 3 years ago
Merge pull request #2181 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
Next