~cytrogen/masto-fe

ref: 9e66c07be70fa71467cfcdf0d4ebff0147bf187a masto-fe/app/javascript d---------
9e66c07b — Renaud Chaput 2 years ago
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading

Port b0780cfeeda641645ea65da257a72ec507e71647 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
[Glitch] Fix using Date.now() instead of intl.now()

Port b3f9a0da520e8024de94b30f801e4ebb83336e8b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
aa57f7e3 — Claire 2 years ago
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
9af04d5a — Claire 2 years ago
[Glitch] Add a confirmation screen when suspending a domain

Port e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
b27a9a59 — Claire 2 years ago
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
8188522b — Renaud Chaput 2 years ago
[Glitch] Fix prev/next buttons color in media viewer

Port 675672feb6011aff990e1caa7383ed3357e5d76b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7e25fd9b — Christian Schmidt 2 years ago
[Glitch] Translate CW, poll options and media descriptions

Port 69057467cba138d2c9e459f565e88ea5979f61b0 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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`.
9e133e25 — Renaud Chaput 2 years ago
[Glitch] Upgrade react-intl

Port 44cd88adc4e2f4028dcc2b08b98368f0dc90cee4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
d907e791 — Claire 2 years ago
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 00c222377db0e305ac3f4a15bf1c18eb89c1f45f
7fc1297c — dependabot[bot] 2 years ago
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0

Port 89d6341c80f5b6cb88ef7efd90622891200249f3 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5e876c29 — Claire 2 years ago
[Glitch] Fix `null` signUp URL in various places

Port 14bb6bb29a49f151c8a6c379e5d2ddb663f8e923 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4993b6e8 — y.takahashi 2 years ago
[Glitch] Handle Surrogate Pairs in truncate()

Port 64b960b6b33086a20b3db8f442c7f2fd2f9b855b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c22fc2fa — Claire 2 years ago
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
ee771f5b — Claire 2 years ago
Fix closeModal invocation (#2239)

Fixes #2238

Some call sites where missed in 382b2a506a14cef96ed57d4c120b4b9e11eae4b5
b0780cfe — Renaud Chaput 2 years ago
Fix `/share` and cleanup and reorganize frontend locale loading (#25240)

5fae2de4 — Claire 2 years ago
Fix overflow behavior of account rows (#25131)

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

Next