~cytrogen/masto-fe

05159d2f — Claire 2 years ago
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread

Port 4c2aca777f6ae6942d0cf11aee56a925694ccdef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
8ef1a95b — Claire 2 years ago
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
7b325aa8 — Renaud Chaput 2 years ago
[Glitch] Autofix missing comma and indentation in JS files

Port 774e1189d26fffd914107a4236f6287043c988f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4a9cdfb9 — Claire 2 years ago
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
b63d5265 — Claire 2 years ago
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread

Port c310374a2f83a890520ace50e41c1e3d046e15e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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>
5fc5a548 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
eabe8397 — renovate[bot] 2 years ago
Update eslint (non-major) (#27328)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.
ac237077 — Claire 2 years ago
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc'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
Next