~cytrogen/masto-fe

ref: ebd201752484c6001be92614e9b244d3f4d06e0a masto-fe/app/javascript/mastodon d---------
fde89a8f — Claire 2 years ago
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
57f592fe — Renaud Chaput 2 years ago
Add Typescript types for some API objects (#26602)

5ea3e8e7 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27144)

Co-authored-by: GitHub Actions <noreply@github.com>
a001ae2f — Claire 2 years ago
Fix explore prompt sometimes showing up when the home TL is loading (#27062)

38753aca — Claire 2 years ago
Fix width of large text icon buttons (#27127)

736fe753 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27080)

Co-authored-by: GitHub Actions <noreply@github.com>
4b7bc1f0 — Renaud Chaput 2 years ago
Convert `dropdown_menu` state to Typescript (#25585)

b93ffb74 — Renaud Chaput 2 years ago
Improve modals reducer types (#26610)

e8245855 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27052)

Co-authored-by: GitHub Actions <noreply@github.com>
c04b08a3 — Claire 2 years ago
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f05985f8 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
5356ddbc — Claire 2 years ago
Fix search results temporarily disappearing while scrolling and loading more results (#27014)

effe4728 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27005)

Co-authored-by: GitHub Actions <noreply@github.com>
61fe25fe — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>
57f47e50 — Claire 2 years ago
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f546b0c9 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
73ecc4de — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26978)

Co-authored-by: GitHub Actions <noreply@github.com>
6f658680 — Claire 2 years ago
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65
22ee4e05 — Claire 2 years ago
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
Next