Skip to content

Actions: OpenShot/libopenshot

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yml
80 workflow runs
80 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump actions/checkout from 3 to 4 Label merge conflicts #816: Commit ba54cfe pushed by dependabot bot
May 13, 2024 11:37 13s dependabot/github_actions/actions/checkout-4
dependabot/github_actions/actions/checkout-4
May 13, 2024 11:37 13s
Merge pull request #931 from OpenShot/dependabot/github_actions/codec… Label merge conflicts #815: Commit d73763f pushed by jonoomph
May 11, 2024 01:25 1m 10s develop
develop
May 11, 2024 01:25 1m 10s
Merge pull request #939 from OpenShot/dependabot/github_actions/fsfe/… Label merge conflicts #814: Commit 74ca13a pushed by jonoomph
May 11, 2024 01:24 1m 10s develop
develop
May 11, 2024 01:24 1m 10s
Merge pull request #935 from Ninpo/fix-test-file-collisions Label merge conflicts #813: Commit 9e9bfb3 pushed by jonoomph
May 11, 2024 01:24 1m 11s develop
develop
May 11, 2024 01:24 1m 11s
Merge pull request #954 from eclipseo/fix_for_ffmpeg7 Label merge conflicts #812: Commit 7104dae pushed by jonoomph
May 11, 2024 01:20 1m 12s develop
develop
May 11, 2024 01:20 1m 12s
Merge pull request #950 from OpenShot/invalid-tracker-region Label merge conflicts #811: Commit a9e34a9 pushed by jonoomph
March 26, 2024 18:49 1m 11s develop
develop
March 26, 2024 18:49 1m 11s
Add new "Display All Boxes" Object Detector property, since it can be… Label merge conflicts #810: Commit 5a0a6a6 pushed by jonoomph
March 5, 2024 16:41 14s invalid-tracker-region
invalid-tracker-region
March 5, 2024 16:41 14s
Fixing aspect ratio of tracked objects, since the tracked object ofte… Label merge conflicts #809: Commit ffb63f5 pushed by jonoomph
March 3, 2024 22:49 12s invalid-tracker-region
invalid-tracker-region
March 3, 2024 22:49 12s
Fix race condition causing clip to clip parents not to work. Adding a… Label merge conflicts #808: Commit 8b47373 pushed by jonoomph
March 2, 2024 03:40 10s invalid-tracker-region
invalid-tracker-region
March 2, 2024 03:40 10s
Fixing parentClipObject and parentTrackedObject transform, so the par… Label merge conflicts #807: Commit 620e894 pushed by jonoomph
March 1, 2024 22:47 14s invalid-tracker-region
invalid-tracker-region
March 1, 2024 22:47 14s
Fix bug with 'Display Box Text' logic being flipped (yes was no, no w… Label merge conflicts #806: Commit 698e6f4 pushed by jonoomph
February 28, 2024 05:22 10s invalid-tracker-region
invalid-tracker-region
February 28, 2024 05:22 10s
Removing "ChildClipId" property, no longer used for attaching clips t… Label merge conflicts #805: Commit 07e4458 pushed by jonoomph
February 26, 2024 22:45 11s invalid-tracker-region
invalid-tracker-region
February 26, 2024 22:45 11s
Change Object Detector to display the class name: object id, instea… Label merge conflicts #804: Commit f15c91d pushed by jonoomph
February 26, 2024 22:06 12s invalid-tracker-region
invalid-tracker-region
February 26, 2024 22:06 12s
Set range of background corner radius to 150.0 (which is essentially … Label merge conflicts #803: Commit 8f3c324 pushed by jonoomph
February 26, 2024 16:47 14s invalid-tracker-region
invalid-tracker-region
February 26, 2024 16:47 14s
Refactor of clip caching, to prevent caching flattened images with pr… Label merge conflicts #802: Commit 15be792 pushed by jonoomph
February 26, 2024 05:39 11s invalid-tracker-region
invalid-tracker-region
February 26, 2024 05:39 11s
Make x1,x2,y1,y2 properties read only in properties window Label merge conflicts #801: Commit 04ec023 pushed by jonoomph
February 24, 2024 22:38 10s invalid-tracker-region
invalid-tracker-region
February 24, 2024 22:38 10s
Fix Tracker/ObjectDetector unit tests, due to new default values Label merge conflicts #800: Commit 4594cf8 pushed by jonoomph
February 23, 2024 03:18 13s invalid-tracker-region
invalid-tracker-region
February 23, 2024 03:18 13s
Refactor of ObjectDetection effect: Label merge conflicts #799: Commit 98383fd pushed by jonoomph
February 23, 2024 02:47 11s invalid-tracker-region
invalid-tracker-region
February 23, 2024 02:47 11s
Refactor of Tracker effect and TrackedObjectBBox: Label merge conflicts #798: Commit 3af6e1f pushed by jonoomph
February 22, 2024 22:22 11s invalid-tracker-region
invalid-tracker-region
February 22, 2024 22:22 11s
Merge pull request #949 from OpenShot/copy-ttf-fonts-appimage Label merge conflicts #797: Commit 284904d pushed by jonoomph
February 18, 2024 17:06 1m 13s develop
develop
February 18, 2024 17:06 1m 13s
Updating RESVG windows build instructions, and removing unit tests fr… Label merge conflicts #796: Commit 4e517a6 pushed by jonoomph
February 17, 2024 21:58 10s copy-ttf-fonts-appimage
copy-ttf-fonts-appimage
February 17, 2024 21:58 10s
Merge pull request #938 from OpenShot/audio-pop-refactor Label merge conflicts #795: Commit d98b5f2 pushed by jonoomph
February 17, 2024 21:23 11s copy-ttf-fonts-appimage
copy-ttf-fonts-appimage
February 17, 2024 21:23 11s
Merge pull request #938 from OpenShot/audio-pop-refactor Label merge conflicts #794: Commit d98b5f2 pushed by jonoomph
February 11, 2024 03:40 1m 10s develop
develop
February 11, 2024 03:40 1m 10s
Reverting experimental c++17 mode (mac build failures with Catch code… Label merge conflicts #793: Commit 4117177 pushed by jonoomph
February 11, 2024 03:26 10s audio-pop-refactor
audio-pop-refactor
February 11, 2024 03:26 10s
Experimental change to use C++17, since our MSYS windows packages hav… Label merge conflicts #792: Commit c7620c9 pushed by jonoomph
February 11, 2024 02:39 11s audio-pop-refactor
audio-pop-refactor
February 11, 2024 02:39 11s