lavender/watch-party
7
4
Fork 5
Code Issues Pull requests 1 Projects Releases Wiki Activity

add options pane, add ping volume and hide player controls settings #8

Open
k wants to merge 1 commit from k/watch-party:options-pane into main
pull from: k/watch-party:options-pane
merge into: lavender:main
Conversation 2 Commits 1 Files changed 6 +644 -489
k commented 2023-01-28 14:10:27 +00:00
First-time contributor
Copy link

hii hello
feel free to say if u want any changes
the way i do the imports for the html part and just bind to window is probably not ideal i was a bit foggy brained

hii hello feel free to say if u want any changes the way i do the imports for the html part and just bind to window is probably not ideal i was a bit foggy brained
k added 1 commit 2023-01-28 14:10:28 +00:00
k commented 2023-01-28 14:23:51 +00:00
Author
First-time contributor
Copy link

also yeah i just noticed the whitespace changes im not sure whats up i just ran prettier and it seemed like it didnt change anything but eh
yeah oop my diff view doesnt show any whitespace changes weiiird

also yeah i just noticed the whitespace changes im not sure whats up i just ran prettier and it seemed like it didnt change anything but eh yeah oop my diff view doesnt show any whitespace changes weiiird
k commented 2023-01-28 17:15:12 +00:00
Author
First-time contributor
Copy link

also yeah the button design is completely optional i was just having fun feel free to like give feedback on it too :)

also yeah the button design is completely optional i was just having fun feel free to like give feedback on it too :)
This pull request has changes conflicting with the target branch.
  • frontend/lib/watch-session.mjs
  • frontend/main.mjs
  • frontend/styles.css
  • frontend/index.html
  • frontend/lib/pling.mjs
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u options-pane:k-options-pane
git checkout k-options-pane

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 checkout main
git merge --no-ff k-options-pane
git checkout k-options-pane
git rebase main
git checkout main
git merge --ff-only k-options-pane
git checkout k-options-pane
git rebase main
git checkout main
git merge --no-ff k-options-pane
git checkout main
git merge --squash k-options-pane
git checkout main
git merge --ff-only k-options-pane
git checkout main
git merge k-options-pane
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: lavender/watch-party#8
No description provided.
Delete branch "k/watch-party:options-pane"

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?