~cytrogen/masto-fe

ref: 9e66c07be70fa71467cfcdf0d4ebff0147bf187a masto-fe/app/javascript/packs d---------
734e1867 — Claire 2 years ago
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different.
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.
b0780cfe — Renaud Chaput 2 years ago
Fix `/share` and cleanup and reorganize frontend locale loading (#25240)

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

Merge upstream changes
44cd88ad — Renaud Chaput 2 years ago
Upgrade react-intl (#24906)

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.
6001f5ff — Claire 2 years ago
[Glitch] Use the new JSX transform everywhere

Port 8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7 to glitch-soc
0222df60 — Claire 2 years ago
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
45d73581 — Claire 2 years ago
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
f959f6cd — Claire 2 years ago
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
d27216dc — Renaud Chaput 2 years ago
Enforce import order with ESLint (#25096)

8d6aea33 — Renaud Chaput 2 years ago
Upgrade to React 18 (#24916)

e6041479 — Claire 2 years ago
Add polling and automatic redirection to `/start` on email confirmation (#25013)

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

Merge upstream changes
1a664560 — Claire 2 years ago
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/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.
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.
e1f466fb — Claire 2 years ago
Fix javascript on moderation interface (#24933)

a3a2414f — Renaud Chaput 2 years ago
Rework polyfills loading (#24907)

955179fc — Renaud Chaput 2 years ago
Dont use CommonJS (`require`, `module.exports`) anywhere (#24913)

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

Merge upstream changes
Next