PAS/nitter

infinite thread scrolling #899

Open

catinshoe wants to merge 1 commit from catinshoe/fix/issue_666 into master

catinshoe commented

2023-06-06 00:01:00 -04:00

(Migrated from github.com)

fixes #666 and maybe #622
note that this doesn't do what #684 wants
I would have liked to use &scroll=true but it appears unsupported for threads (404s)

middle of a lengthy thread for testing: https://nitter.net/adamscochran/status/1255335532638453762#m

fixes #666 and maybe #622 note that this doesn't do what #684 wants I would have liked to use `&scroll=true` but it appears unsupported for threads (404s) middle of a lengthy thread for testing: https://nitter.net/adamscochran/status/1255335532638453762#m

This pull request has changes conflicting with the target branch.

public/js/infiniteScroll.js

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'infinite thread scrolling' (#899) from catinshoe/fix/issue_666 into master

Merge commit body

Reviewed-on: https://git.merrycorps.xyz/PAS/nitter/pulls/899

Merge pull request 'infinite thread scrolling' (#899) from catinshoe/fix/issue_666 into master

Reviewed-on: https://git.merrycorps.xyz/PAS/nitter/pulls/899

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin catinshoe/fix/issue_666:catinshoe/fix/issue_666

git switch catinshoe/fix/issue_666

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff catinshoe/fix/issue_666

git switch catinshoe/fix/issue_666

git rebase master

git switch master

git merge --ff-only catinshoe/fix/issue_666

git switch catinshoe/fix/issue_666

git rebase master

git switch master

git merge --no-ff catinshoe/fix/issue_666

git switch master

git merge --squash catinshoe/fix/issue_666