Skip to content

Actions: OpenShot/libopenshot

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

More tweaks to keep the cache window centered on the playhead, so dif… Label merge conflicts #930: Commit fd91892 pushed by jonoomph
June 3, 2025 22:50 7s caching-improvements
caching-improvements
June 3, 2025 22:50 7s
Merge pull request #1012 from OpenShot/fix-deinterlace-crash Label merge conflicts #929: Commit 28aacfd pushed by jonoomph
June 2, 2025 22:33 1m 8s develop
develop
June 2, 2025 22:33 1m 8s
Improving performance of Mask effect (transitions) using OMP + reduci… Label merge conflicts #928: Commit 7f130cb pushed by jonoomph
June 2, 2025 21:09 7s fix-deinterlace-crash
fix-deinterlace-crash
June 2, 2025 21:09 7s
Merge pull request #1011 from OpenShot/godot-bindings Label merge conflicts #927: Commit 3c3572a pushed by jonoomph
June 2, 2025 02:01 1m 11s develop
develop
June 2, 2025 02:01 1m 11s
Adding reuse copyright and licensing info Label merge conflicts #926: Commit 26e6ef4 pushed by jonoomph
May 31, 2025 22:56 8s godot-bindings
godot-bindings
May 31, 2025 22:56 8s
Reverting FFmpegReader depreciation changes around side data (due to … Label merge conflicts #925: Commit 05c8a54 pushed by jonoomph
May 31, 2025 21:31 7s godot-bindings
godot-bindings
May 31, 2025 21:31 7s
Initial GDExtension demo code, which can initialize a Timeline and FF… Label merge conflicts #924: Commit efedc09 pushed by jonoomph
May 31, 2025 21:00 8s godot-bindings
godot-bindings
May 31, 2025 21:00 8s
Merge pull request #1008 from OpenShot/lens-flare Label merge conflicts #923: Commit cf1bad8 pushed by jonoomph
May 29, 2025 23:55 1m 9s develop
develop
May 29, 2025 23:55 1m 9s
Merge branch 'develop' into lens-flare Label merge conflicts #922: Commit 2a44ff5 pushed by jonoomph
May 29, 2025 18:13 10s lens-flare
lens-flare
May 29, 2025 18:13 10s
Merge pull request #1010 from OpenShot/sqs-builds Label merge conflicts #921: Commit 53ca6dd pushed by jonoomph
May 29, 2025 16:28 1m 12s develop
develop
May 29, 2025 16:28 1m 12s
Making windows builds use 4 CPUs (testing performance of this change) Label merge conflicts #920: Commit e39bd39 pushed by jonoomph
May 29, 2025 16:00 11s sqs-builds
sqs-builds
May 29, 2025 16:00 11s
Updating tags Label merge conflicts #919: Commit 6dce2ed pushed by jonoomph
May 29, 2025 15:49 10s sqs-builds
sqs-builds
May 29, 2025 15:49 10s
Integrating dynamic SQS-based Auto-scaling builders into our Gitlab C… Label merge conflicts #918: Commit 377c5b9 pushed by jonoomph
May 29, 2025 15:47 8s sqs-builds
sqs-builds
May 29, 2025 15:47 8s
Merge branch 'develop' into lens-flare Label merge conflicts #917: Commit d26ef4d pushed by jonoomph
May 29, 2025 01:36 8s lens-flare
lens-flare
May 29, 2025 01:36 8s
Merge pull request #1009 from OpenShot/colormap-effect Label merge conflicts #916: Commit 6cc627b pushed by jonoomph
May 28, 2025 22:52 1m 11s develop
develop
May 28, 2025 22:52 1m 11s
Adding unit tests for Lens Flare effect, and adding effect to Python … Label merge conflicts #915: Commit 3db2fe1 pushed by jonoomph
May 28, 2025 22:45 8s lens-flare
lens-flare
May 28, 2025 22:45 8s
Removing depreciated calls to alphaChannel() Label merge conflicts #914: Commit 8c5ec9f pushed by jonoomph
May 28, 2025 22:18 9s lens-flare
lens-flare
May 28, 2025 22:18 9s
Replacing QRegEx with QRegularExpression, and removing Qt:SkipEmptyPa… Label merge conflicts #913: Commit fe51dbb pushed by jonoomph
May 26, 2025 19:07 11s colormap-effect
colormap-effect
May 26, 2025 19:07 11s
Removing SkipEmptyParts arg from regex cube parsing, to better suppor… Label merge conflicts #912: Commit f06b6c0 pushed by jonoomph
May 26, 2025 05:11 10s colormap-effect
colormap-effect
May 26, 2025 05:11 10s
Adding missing effects to .i swig files Label merge conflicts #911: Commit 6a2f4f5 pushed by jonoomph
May 26, 2025 04:30 8s colormap-effect
colormap-effect
May 26, 2025 04:30 8s
Merge pull request #1005 from OpenShot/sharpen-effect Label merge conflicts #910: Commit dffa84b pushed by jonoomph
May 24, 2025 05:17 1m 9s develop
develop
May 24, 2025 05:17 1m 9s
Fixing some effect includes in effects.h, since I forgot to add them … Label merge conflicts #909: Commit 7548f87 pushed by jonoomph
May 24, 2025 03:28 9s sharpen-effect
sharpen-effect
May 24, 2025 03:28 9s
Merge pull request #1004 from OpenShot/360-spherical Label merge conflicts #908: Commit ea74c50 pushed by jonoomph
May 24, 2025 03:22 1m 9s develop
develop
May 24, 2025 03:22 1m 9s
Merge pull request #1006 from OpenShot/align-memory-32 Label merge conflicts #907: Commit 1af80cc pushed by jonoomph
May 24, 2025 03:18 1m 10s develop
develop
May 24, 2025 03:18 1m 10s
Adding 32 bit alignment for simd into our AV_ALLOCATE_IMAGE macro, an… Label merge conflicts #906: Commit 68b885e pushed by jonoomph
May 23, 2025 23:36 8s align-memory-32
align-memory-32
May 23, 2025 23:36 8s