fediverse/fep
37
268
Fork
You've already forked fep
100

WIP: FEP-a4c8: Timeline preferences #370

Draft
avidseeker wants to merge 2 commits from avidseeker/fep:timeline into main
pull from: avidseeker/fep:timeline
merge into: fediverse:main
fediverse:main
fediverse:pages
Contributor
Copy link

This proposal is for standardized timeline preferences:

  • whether the user wants algorithmic content enabled
  • whether to save the last position in the timeline
  • preferred order of items in the timeline (natural reading).
This proposal is for standardized timeline preferences: * whether the user wants algorithmic content enabled * whether to save the last position in the timeline * preferred order of items in the timeline (natural reading).
FEP-a4c8: Timeline preferences
All checks were successful
ci/woodpecker/pr/test Pipeline was successful
6c93d34449

Hey @avidseeker
This proposal looks incomplete, is it a work in progress? In that case, please add WIP: prefix to the PR title.

Hey @avidseeker This proposal looks incomplete, is it a work in progress? In that case, please add `WIP: ` prefix to the PR title.
avidseeker changed title from (削除) FEP-a4c8: Timeline preferences (削除ここまで) to WIP: FEP-a4c8: Timeline preferences 2024年07月17日 01:30:15 +02:00
Update discussionsTo
All checks were successful
ci/woodpecker/pr/test Pipeline was successful
bebbcad292
All checks were successful
ci/woodpecker/pr/test Pipeline was successful
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u timeline:avidseeker-timeline
git switch avidseeker-timeline

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 main
git merge --no-ff avidseeker-timeline
git switch avidseeker-timeline
git rebase main
git switch main
git merge --ff-only avidseeker-timeline
git switch avidseeker-timeline
git rebase main
git switch main
git merge --no-ff avidseeker-timeline
git switch main
git merge --squash avidseeker-timeline
git switch main
git merge --ff-only avidseeker-timeline
git switch main
git merge avidseeker-timeline
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
fediverse/fep!370
Reference in a new issue
fediverse/fep
No description provided.
Delete branch "avidseeker/fep:timeline"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?