~cytrogen/masto-fe

ref: 9e66c07be70fa71467cfcdf0d4ebff0147bf187a masto-fe/app/javascript/mastodon/features/status/components d---------
93c71441 — Claire 2 years ago
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
fca2dff2 — Claire 2 years ago
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
69057467 — Christian Schmidt 2 years ago
Translate CW, poll options and media descriptions (#24175)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
0669783d — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
0e746671 — Claire 2 years ago
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
1cd7f5ff — Claire 2 years ago
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
8278907f — Claire 2 years ago
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
9381f781 — Claire 2 years ago
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
0222df60 — Claire 2 years ago
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
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.
e58c36d3 — Renaud Chaput 2 years ago
Update inconsistent `defaultMessage` (#25114)

1caa5ff3 — Eugen Rochko 2 years ago
Change share action from being in action bar to being in dropdown in web UI (#25105)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
d27216dc — Renaud Chaput 2 years ago
Enforce import order with ESLint (#25096)

5a16bd7b — Renaud Chaput 2 years ago
Use JSX syntax for Fragments (#25093)

8f66126b — Renaud Chaput 2 years ago
Use the new JSX transform (#25064)

054df2d6 — Claire 2 years ago
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
b878e3d8 — Nick Schonning 2 years ago
Enable ESLint react/no-deprecated (#24471)

349cae0b — fusagiko / takayamaki 2 years ago
Add type annotation for DisplayName component (#24752)

c81d1b0d — Claire 2 years ago
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/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.
f08f6d20 — Claire 2 years ago
Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
Next