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
336 workflow runs
336 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Removing console from CX_Freeze script, and resuming use of Win32GUI Label merge conflicts #1514: Commit eaaa286 pushed by jonoomph
December 10, 2024 05:56 14s recovery-menu
recovery-menu
December 10, 2024 05:56 14s
Adding additional documentation and troubleshooting steps for audio b… Label merge conflicts #1513: Commit d889b62 pushed by jonoomph
December 9, 2024 21:46 12s recovery-menu
recovery-menu
December 9, 2024 21:46 12s
Adding audio buffer size to preferences, with reasonable default limi… Label merge conflicts #1512: Commit 9057b39 pushed by jonoomph
December 9, 2024 21:22 11s recovery-menu
recovery-menu
December 9, 2024 21:22 11s
Experimental base to console, for debug output on win 11 Label merge conflicts #1511: Commit 341978b pushed by jonoomph
December 9, 2024 18:54 12s recovery-menu
recovery-menu
December 9, 2024 18:54 12s
Adding recovery menu to OpenShot for recovering previous auto-save files Label merge conflicts #1510: Commit 7215088 pushed by jonoomph
October 12, 2024 21:41 13s recovery-menu
recovery-menu
October 12, 2024 21:41 13s
Merge pull request #5634 from OpenShot/choose-profile-v2 Label merge conflicts #1509: Commit 5ed8300 pushed by jonoomph
October 12, 2024 20:43 1m 10s develop
develop
October 12, 2024 20:43 1m 10s
Updates to documentation of Profiles... some Raffi edits/feedback. Label merge conflicts #1508: Commit 898f8f7 pushed by jonoomph
October 12, 2024 20:15 10s choose-profile-v2
choose-profile-v2
October 12, 2024 20:15 10s
Small refactor of the selection logic in Profile editor, to clear the… Label merge conflicts #1507: Commit d533abd pushed by jonoomph
October 11, 2024 19:57 19s choose-profile-v2
choose-profile-v2
October 11, 2024 19:57 19s
Fixing small issue with "Create Profile" context menu, to correctly s… Label merge conflicts #1506: Commit 837056a pushed by jonoomph
October 11, 2024 18:50 10s choose-profile-v2
choose-profile-v2
October 11, 2024 18:50 10s
Small update to user-guide docs about "Set as Default Profile" Label merge conflicts #1505: Commit c708418 pushed by jonoomph
October 11, 2024 18:42 11s choose-profile-v2
choose-profile-v2
October 11, 2024 18:42 11s
Adding new validation logic to prevent deletion of custom profile whi… Label merge conflicts #1504: Commit 3017b38 pushed by jonoomph
October 11, 2024 18:38 11s choose-profile-v2
choose-profile-v2
October 11, 2024 18:38 11s
Select newly inserted rows in Profile model/view. This fixes a bug wh… Label merge conflicts #1503: Commit 5cdefbf pushed by jonoomph
October 11, 2024 04:04 11s choose-profile-v2
choose-profile-v2
October 11, 2024 04:04 11s
Adding "Choose Profile" context menu, Profile Editor (Duplicate/Edit/… Label merge conflicts #1502: Commit 2845489 pushed by jonoomph
October 10, 2024 23:50 10s choose-profile-v2
choose-profile-v2
October 10, 2024 23:50 10s
Refactor audio-only files changing sizes when profile change is detec… Label merge conflicts #1501: Commit afefac5 pushed by jonoomph
October 10, 2024 17:57 11s choose-profile-v2
choose-profile-v2
October 10, 2024 17:57 11s
Simplify the profile creation and equality checking (in context menu)… Label merge conflicts #1500: Commit 8c39d14 pushed by jonoomph
October 10, 2024 17:47 14s choose-profile-v2
choose-profile-v2
October 10, 2024 17:47 14s
Fixing small typo in docs Label merge conflicts #1499: Commit 58f50fe pushed by jonoomph
October 9, 2024 21:58 11s choose-profile-v2
choose-profile-v2
October 9, 2024 21:58 11s
Adding new Profile Editor. New context menu options to Edit, Duplicat… Label merge conflicts #1498: Commit 68fd550 pushed by jonoomph
October 9, 2024 21:55 19s choose-profile-v2
choose-profile-v2
October 9, 2024 21:55 19s
Merge pull request #5636 from OpenShot/fix-keyboard-shortcuts-docs Label merge conflicts #1497: Commit 2ee8cd6 pushed by jonoomph
October 9, 2024 01:05 1m 11s develop
develop
October 9, 2024 01:05 1m 11s
Fix to white space in keyboard shortcuts (user-guide) which caused th… Label merge conflicts #1496: Commit 33361d4 pushed by jonoomph
October 8, 2024 20:04 13s fix-keyboard-shortcuts-docs
fix-keyboard-shortcuts-docs
October 8, 2024 20:04 13s
Adding new "Choose Profile" context menu to Project Files, to make it… Label merge conflicts #1495: Commit 2715855 pushed by jonoomph
October 8, 2024 02:20 10s choose-profile-v2
choose-profile-v2
October 8, 2024 02:20 10s
Merge pull request #5627 from OpenShot/multi-drop-improvements Label merge conflicts #1494: Commit fbaecef pushed by jonoomph
October 7, 2024 19:07 1m 12s develop
develop
October 7, 2024 19:07 1m 12s
Disable image sequences and error messages when dragging OS files ont… Label merge conflicts #1493: Commit b77c12c pushed by jonoomph
October 7, 2024 03:07 17s multi-drop-improvements
multi-drop-improvements
October 7, 2024 03:07 17s
Fix small regression which re-enables ability to edit File name and F… Label merge conflicts #1492: Commit af436da pushed by jonoomph
October 6, 2024 23:28 13s multi-drop-improvements
multi-drop-improvements
October 6, 2024 23:28 13s
Fixed small regression on transactions affecting multiple clips on dr… Label merge conflicts #1491: Commit 663fc44 pushed by jonoomph
October 6, 2024 19:05 10s multi-drop-improvements
multi-drop-improvements
October 6, 2024 19:05 10s
Merge branch 'develop' into multi-drop-improvements Label merge conflicts #1490: Commit 442986d pushed by jonoomph
October 6, 2024 18:57 10s multi-drop-improvements
multi-drop-improvements
October 6, 2024 18:57 10s