~cytrogen/masto-fe

ref: 9e66c07be70fa71467cfcdf0d4ebff0147bf187a masto-fe/app/views 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
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.
8884d1ec — Claire 2 years ago
Add support for importing lists (#25203)

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

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

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
2e02d035 — Claire 2 years ago
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
ad109897 — Claire 2 years ago
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
ba73f0ea — Claire 2 years ago
[Glitch] Add polling and automatic redirection to `/start` on email confirmation

Port e60414792d86a99c0f401f3c1bab92ee37835d39 to glitch-soc
f959f6cd — Claire 2 years ago
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' 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.
2f2f74ef — Claire 2 years ago
[Glitch] Update style of captcha confirmation page to match sign-up form (#2226)

2a61f147 — Claire 2 years ago
Fix account confirmation flow not returning to app after captcha validation (#25057)

e13d2edd — Claire 2 years ago
Fix “Authorized applications” inefficiently and incorrectly getting last use date (#25060)

bec6a1ca — Claire 2 years ago
Add hCaptcha support (#25019)

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

5241f7b2 — Christian Schmidt 2 years ago
Fix UI crash in moderation interface when opening the media modal (#24816)

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

Merge upstream changes
Next