~cytrogen/masto-fe

ref: 9af24835f6f7ecc6e71c9767562d78bd4d90dcac masto-fe/app/javascript d---------
9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
967bd543 — Claire 2 years ago
[Glitch] Fix auto-loading-more when not scrolled

Port 2b98e2ecd6224ad41d38f5febd31efa7e4de316d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
53f5b27b — Claire 2 years ago
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
86c9c5af — Claire 2 years ago
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
74c27e33 — Claire 2 years ago
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
8eb09c6f — Michael Stanclift 2 years ago
[Glitch] Keep version string displayed without breakpoints in UI

Port 5a437edc7f22d5797e5af29d9b450a03eccec304 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
e83059fd — Claire 2 years ago
[Glitch] Fix explore prompt appearing because of posts being received out of order

Port d80a819fc60b530042784cc3f20cd3041ee0a996 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
cfc0da77 — Michael Stanclift 2 years ago
[Glitch] Fix retention dashboard not displaying correct month

Port 7fddeca1907493fb327316c5447740922acb934f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
4d59dfb1 — Claire 2 years ago
Fix some remote posts getting truncated (#27307)

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

Co-authored-by: GitHub Actions <noreply@github.com>
2b98e2ec — Claire 2 years ago
Fix auto-loading-more when not scrolled (#27286)

32ab4744 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27277)

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

Co-authored-by: GitHub Actions <noreply@github.com>
37bbd3c1 — Claire 2 years ago
Fix double scroll bars in some columns in advanced interface (#27187)

5a437edc — Michael Stanclift 2 years ago
Keep version string displayed without breakpoints in UI (#26986)

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

Co-authored-by: GitHub Actions <noreply@github.com>
Next