j3d1/toolshed
1
0
Fork 0
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity

feat: Implement WebcamFileSource for life webcam capture #12

Open
busti wants to merge 51 commits from busti/proto/frontend into jedi/proto/frontend
pull from: busti/proto/frontend
merge into: j3d1:jedi/proto/frontend
Conversation 0 Commits 51 Files changed 122 +62344 -6
busti commented 2023-12-09 02:03:20 +00:00
Collaborator
Copy link
No description provided.
busti added 2 commits 2023-12-09 02:03:20 +00:00
feat: implement WebcamFileSource
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
25ee3dd4f2
busti added 1 commit 2023-12-10 06:04:22 +00:00
fix: automatically select highest available video resolution
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
64caa7e547
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
This pull request has changes conflicting with the target branch.
  • .gitignore
  • README.md
  • frontend/package-lock.json
  • frontend/package.json
  • frontend/src/components/BadgeSelectField.vue
  • frontend/src/components/BaseLayout.vue
  • frontend/src/components/Footer.vue
  • frontend/src/components/PropertyBadge.vue
  • frontend/src/components/PropertyField.vue
  • frontend/src/components/Sidebar.vue
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin busti/proto/frontend:busti/proto/frontend
git checkout busti/proto/frontend

Merge

Merge the changes and update on Forgejo.
git checkout jedi/proto/frontend
git merge --no-ff busti/proto/frontend
git checkout jedi/proto/frontend
git merge --ff-only busti/proto/frontend
git checkout busti/proto/frontend
git rebase jedi/proto/frontend
git checkout jedi/proto/frontend
git merge --no-ff busti/proto/frontend
git checkout jedi/proto/frontend
git merge --squash busti/proto/frontend
git checkout jedi/proto/frontend
git merge --ff-only busti/proto/frontend
git checkout jedi/proto/frontend
git merge busti/proto/frontend
git push origin jedi/proto/frontend
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: j3d1/toolshed#12
No description provided.
Delete branch "busti/proto/frontend"

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?