~cytrogen/masto-fe

ref: e83059fd9d6cd4c6fa8723a36c9a4c7a62ae637b masto-fe/app/javascript/mastodon d---------
e9a181c5 — Claire 2 years ago
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
702d1629 — Claire 2 years ago
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
e95d25e1 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27260)

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

Co-authored-by: GitHub Actions <noreply@github.com>
d80a819f — Claire 2 years ago
Fix explore prompt appearing because of posts being received out of order (#27211)

695e42de — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27202)

Co-authored-by: GitHub Actions <noreply@github.com>
1da3c588 — Claire 2 years ago
Fix link handling of mentions in user profiles when logged out (#27185)

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

Co-authored-by: GitHub Actions <noreply@github.com>
7fddeca1 — Michael Stanclift 2 years ago
Fix retention dashboard not displaying correct month (#27180)

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>
Next