~cytrogen/masto-fe

8278907f — Claire 2 years ago
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
6001f5ff — Claire 2 years ago
[Glitch] Use the new JSX transform everywhere

Port 8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7 to glitch-soc
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
1347ca6e — Claire 2 years ago
fixup! [Glitch] Upgrade to React 18
61f6cd45 — Claire 2 years ago
Fix glitch-soc-only tests being broken because of test refactor
60c7e559 — たいち ひ 2 years ago
[Glitch] Rewrite `<TimelineHint />` as FC and TS

Port 9a472efe7c21447ce4e246bacff5a857a341e4f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
6746e5d4 — たいち ひ 2 years ago
[Glitch] Rewrite `<Skeleton/>` as FC and TS

Port 8066118d1f558ed9c53d1c775a78553c6167161b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
892b3c16 — Claire 2 years ago
[Glitch] Allow scripts in post embed previews

Port 711a03766032a94e0b409f8a545770bc90c14f61 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
e2ab9d4d — Claire 2 years ago
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
3b375ee3 — Renaud Chaput 2 years ago
[Glitch] Upgrade to React 18

Port 8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
45d73581 — Claire 2 years ago
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' 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
b0ec3bfc — Claire 2 years ago
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline

Port 7b54e47d034556a8709425ed8d7fc0a0da34c01a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4a1f4cb6 — Christian Schmidt 2 years ago
[Glitch] Fix UI crash in moderation interface when opening the media modal

Port 5241f7b2fde593e27bc6ba13ec5b33d95f9768f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
d7282221 — Eugen Rochko 2 years ago
[Glitch] Change "Sign in" to "Login"

Port 3869e8c21069a9bc927e93c904e00d68b004a5be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
602ae7f2 — Claire 2 years ago
[Glitch] Fix videos being improperly positioned on safari

Port 0eed06073f6d80bd67ee87ef7d3b682943345e4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Next