~cytrogen/masto-fe

ref: 1a4a23b5c8a8e0beacded9bc44354e3f8778ae26 masto-fe/app/javascript/mastodon d---------
1a4a23b5 — Claire 2 years ago
Merge pull request #2439 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 4c2aca777f6ae6942d0cf11aee56a925694ccdef
8ef1a95b — Claire 2 years ago
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
4a9cdfb9 — Claire 2 years ago
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
3da7afde — Claire 2 years ago
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
4c2aca77 — Claire 2 years ago
Fix clicking on already-loaded thread scrolling to the top of the thread (#27338)

9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
774e1189 — Renaud Chaput 2 years ago
Change `eslint` config to autofix missing comma and indentation in JS files (#26711)

c310374a — Claire 2 years ago
Fix clicking on already-opened thread post scrolling to the top of the thread (#27331)

89b48681 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27321)

Co-authored-by: GitHub Actions <noreply@github.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
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
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
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>
Next