~cytrogen/masto-fe

ref: 9e66c07be70fa71467cfcdf0d4ebff0147bf187a masto-fe/app/javascript/mastodon/components d---------
aa57f7e3 — Claire 2 years ago
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
b27a9a59 — Claire 2 years ago
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
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`.
85722a91 — Claire 2 years ago
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.
5fae2de4 — Claire 2 years ago
Fix overflow behavior of account rows (#25131)

Fix using Date.now() instead of intl.now() (#25234)

e9385e93 — Claire 2 years ago
Add a confirmation screen when suspending a domain (#25144)

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>
44cd88ad — Renaud Chaput 2 years ago
Upgrade react-intl (#24906)

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
e2ab9d4d — Claire 2 years ago
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
45d73581 — Claire 2 years ago
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
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.
38c62160 — fusagiko / takayamaki 2 years ago
Rewrite actions/modal and reducers/modal with typescript (#24833)

Next