Skip to content

Actions: OpenShot/openshot-qt

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #5632 from OpenShot/improved-dock-widgets Label merge conflicts #1489: Commit 4a3c1d9 pushed by jonoomph
October 6, 2024 18:56 1m 10s develop
develop
October 6, 2024 18:56 1m 10s
Adding transaction around adding multiple files in OpenShot (import o… Label merge conflicts #1488: Commit 77ff831 pushed by jonoomph
October 6, 2024 18:55 13s multi-drop-improvements
multi-drop-improvements
October 6, 2024 18:55 13s
Large refactor of os_drop, so that it becomes movable and droppable s… Label merge conflicts #1487: Commit ad163a1 pushed by jonoomph
October 5, 2024 05:20 10s multi-drop-improvements
multi-drop-improvements
October 5, 2024 05:20 10s
Merge branch 'develop' into multi-drop-improvements Label merge conflicts #1486: Commit 10f34df pushed by jonoomph
October 4, 2024 22:35 10s multi-drop-improvements
multi-drop-improvements
October 4, 2024 22:35 10s
Merge pull request #5621 from OpenShot/drag-off-timeline Label merge conflicts #1485: Commit 00c3cb4 pushed by jonoomph
October 4, 2024 21:10 1m 15s develop
develop
October 4, 2024 21:10 1m 15s
Removing topLevelChanged logic, since it had no effect during testing Label merge conflicts #1484: Commit 400c455 pushed by jonoomph
October 4, 2024 20:38 11s improved-dock-widgets
improved-dock-widgets
October 4, 2024 20:38 11s
Experimental support for top level widget changing + window flags Label merge conflicts #1483: Commit fe607ed pushed by jonoomph
October 3, 2024 18:14 14s improved-dock-widgets
improved-dock-widgets
October 3, 2024 18:14 14s
Improving style of tabbed dock widgets for Cosmic theme, specifically… Label merge conflicts #1482: Commit a454b7f pushed by jonoomph
October 3, 2024 17:38 12s improved-dock-widgets
improved-dock-widgets
October 3, 2024 17:38 12s
Adding range selection (i.e. SHIFT+Click) to documentation Label merge conflicts #1481: Commit b64ba44 pushed by jonoomph
October 1, 2024 20:51 10s multi-drop-improvements
multi-drop-improvements
October 1, 2024 20:51 10s
Modify JumpToStart to use the GetMinFrame() method, and have it scrol… Label merge conflicts #1480: Commit 8a25c68 pushed by jonoomph
October 1, 2024 19:56 14s multi-drop-improvements
multi-drop-improvements
October 1, 2024 19:56 14s
Updating documentation regarding "Resizing Edges" of clips Label merge conflicts #1479: Commit 0699779 pushed by jonoomph
October 1, 2024 19:40 10s multi-drop-improvements
multi-drop-improvements
October 1, 2024 19:40 10s
Moving ripple selection to Alt+Click, and adding a more traditional S… Label merge conflicts #1478: Commit ad83b95 pushed by jonoomph
October 1, 2024 19:34 11s multi-drop-improvements
multi-drop-improvements
October 1, 2024 19:34 11s
Fixing issues with multi-drop on the timeline, to only query the JS p… Label merge conflicts #1477: Commit a4cf603 pushed by jonoomph
October 1, 2024 02:30 13s multi-drop-improvements
multi-drop-improvements
October 1, 2024 02:30 13s
Fixing Codacy nitpicks in JS Label merge conflicts #1476: Commit a2051ca pushed by jonoomph
September 30, 2024 22:49 11s drag-off-timeline
drag-off-timeline
September 30, 2024 22:49 11s
Update translations for new checkboxes on Export dialog, and update E… Label merge conflicts #1475: Commit 6dc4364 pushed by jonoomph
September 30, 2024 21:39 14s drag-off-timeline
drag-off-timeline
September 30, 2024 21:39 14s
Rename "Export Entire Timeline" option to "End at Last Clip", and add… Label merge conflicts #1474: Commit 39be79e pushed by jonoomph
September 30, 2024 21:20 14s drag-off-timeline
drag-off-timeline
September 30, 2024 21:20 14s
Adding export settings to a project, so the export dialog will always… Label merge conflicts #1473: Commit 70c59e5 pushed by jonoomph
September 30, 2024 19:53 12s drag-off-timeline
drag-off-timeline
September 30, 2024 19:53 12s
Adding new Advanced export option (Export Entire Timeline), which adj… Label merge conflicts #1472: Commit c50f3c9 pushed by jonoomph
September 24, 2024 18:53 14s drag-off-timeline
drag-off-timeline
September 24, 2024 18:53 14s
Keep the right edge of the timeline stuck on the right side of the sc… Label merge conflicts #1471: Commit b8f560b pushed by jonoomph
September 23, 2024 03:20 10s drag-off-timeline
drag-off-timeline
September 23, 2024 03:20 10s
When extremely zoomed in on the right edge of the timeline, keep the … Label merge conflicts #1470: Commit 347296f pushed by jonoomph
September 22, 2024 04:33 12s drag-off-timeline
drag-off-timeline
September 22, 2024 04:33 12s
Renaming .resize-handle to .track-resize-handle for clarity. Adding s… Label merge conflicts #1469: Commit 2109d06 pushed by jonoomph
September 20, 2024 20:15 13s drag-off-timeline
drag-off-timeline
September 20, 2024 20:15 13s
Fixed many issues with track resizing, and playhead becoming detacthe… Label merge conflicts #1468: Commit c7d98a2 pushed by jonoomph
September 20, 2024 19:45 11s drag-off-timeline
drag-off-timeline
September 20, 2024 19:45 11s
Fixed bug when single click jumping the zoom slider to a new position… Label merge conflicts #1467: Commit 011890f pushed by jonoomph
September 20, 2024 03:19 10s drag-off-timeline
drag-off-timeline
September 20, 2024 03:19 10s
Fixed bug on double click when restoring previous scrollbar, that cau… Label merge conflicts #1466: Commit a4319ba pushed by jonoomph
September 20, 2024 03:14 14s drag-off-timeline
drag-off-timeline
September 20, 2024 03:14 14s
Tons of fixes to Zoom Slider, no longer breaks when zooming too far o… Label merge conflicts #1465: Commit 0eb5935 pushed by jonoomph
September 20, 2024 01:58 14s drag-off-timeline
drag-off-timeline
September 20, 2024 01:58 14s