7
33
Fork
You've already forked sentryshot
7

Add "Auto" live view mode that's SD in grid, but HD full-page #39

Open
byteit101 wants to merge 1 commit from byteit101/sentryshot:master into master
pull from: byteit101/sentryshot:master
merge into: SentryShot:master
SentryShot:master
SentryShot:sub_rec
SentryShot:recdb_v2
SentryShot:vino
SentryShot:sidebar
SentryShot:temp
SentryShot:range-streamer
SentryShot:logdb
First-time contributor
Copy link

This adds and makes default a mode that shows the grid tiles in SD/substream mode, but upon maximizing, the stream is replaced with HD

This can be refactored, but I wanted to be minimally invasive to other places. Tested and confirmed working.

This adds and makes default a mode that shows the grid tiles in SD/substream mode, but upon maximizing, the stream is replaced with HD This can be refactored, but I wanted to be minimally invasive to other places. Tested and confirmed working.
Add "Auto" live view mode that's SD in grid, but HD full-page
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
ef8ccec1eb
Owner
Copy link

Related: Curid/os-nvr#313

Related: https://codeberg.org/Curid/os-nvr/pulls/313
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
This pull request has changes conflicting with the target branch.
  • web/assets/scripts/components/feed.js
  • web/assets/scripts/live.js
  • web/assets/scripts/live_test.js
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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 byteit101-master
git switch byteit101-master
git rebase master
git switch master
git merge --ff-only byteit101-master
git switch byteit101-master
git rebase master
git switch master
git merge --no-ff byteit101-master
git switch master
git merge --squash byteit101-master
git switch master
git merge --ff-only byteit101-master
git switch master
git merge byteit101-master
git push origin master
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
SentryShot/sentryshot!39
Reference in a new issue
SentryShot/sentryshot
No description provided.
Delete branch "byteit101/sentryshot:master"

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?