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

Bumping version to in-development version Label merge conflicts #1414: Commit f4e1fe8 pushed by jonoomph
July 30, 2024 01:26 11s fix-release-notes-link
fix-release-notes-link
July 30, 2024 01:26 11s
Fix release notes link in frozen release versions Label merge conflicts #1413: Commit bd6be1e pushed by jonoomph
July 30, 2024 01:24 12s fix-release-notes-link
fix-release-notes-link
July 30, 2024 01:24 12s
Merge pull request #5578 from OpenShot/release-20240709 Label merge conflicts #1412: Commit ae76734 pushed by jonoomph
July 11, 2024 20:11 1m 11s develop
develop
July 11, 2024 20:11 1m 11s
Fixing error with publish script, to skip 'develop' branches. Label merge conflicts #1411: Commit 4c6975e pushed by jonoomph
July 11, 2024 19:21 13s release-20240709
release-20240709
July 11, 2024 19:21 13s
Updating deploy script to allow for partial deployments (i.e. if only… Label merge conflicts #1410: Commit 637beec pushed by jonoomph
July 11, 2024 18:40 12s v3.2.1
v3.2.1
July 11, 2024 18:40 12s
Updating deploy script to allow for partial deployments (i.e. if only… Label merge conflicts #1409: Commit 637beec pushed by jonoomph
July 10, 2024 21:01 12s release-20240709
release-20240709
July 10, 2024 21:01 12s
Fixing background theme color on preview / split clip dialog Label merge conflicts #1408: Commit a0fee0c pushed by jonoomph
July 10, 2024 00:53 13s release-20240709
release-20240709
July 10, 2024 00:53 13s
Bumping version for 3.2.1 release Label merge conflicts #1407: Commit c79aed9 pushed by jonoomph
July 9, 2024 22:35 12s release-20240709
release-20240709
July 9, 2024 22:35 12s
Merge pull request #5577 from OpenShot/sentry-fixes-2024-07-08 Label merge conflicts #1406: Commit f844f15 pushed by jonoomph
July 9, 2024 21:16 1m 16s develop
develop
July 9, 2024 21:16 1m 16s
Merge pull request #5576 from OpenShot/restore-geometry-twice Label merge conflicts #1405: Commit 228b3d5 pushed by jonoomph
July 9, 2024 02:08 1m 13s develop
develop
July 9, 2024 02:08 1m 13s
Fixing Sentry #OPENSHOT-4D: Couldn't apply 'update' to update listene… Label merge conflicts #1404: Commit fddbdd0 pushed by jonoomph
July 9, 2024 02:01 13s sentry-fixes-2024-07-08
sentry-fixes-2024-07-08
July 9, 2024 02:01 13s
Restore geometry and window state twice (once on creation of main win… Label merge conflicts #1403: Commit 3b8373e pushed by jonoomph
July 8, 2024 22:29 12s restore-geometry-twice
restore-geometry-twice
July 8, 2024 22:29 12s
Experimental save/restore window geometry without using built-in Qt m… Label merge conflicts #1402: Commit 9098267 pushed by jonoomph
July 8, 2024 20:59 12s new-window-geometry
new-window-geometry
July 8, 2024 20:59 12s
Merge pull request #5574 from OpenShot/delay-show-main-window Label merge conflicts #1401: Commit 06e6d0d pushed by jonoomph
July 8, 2024 20:31 1m 12s develop
develop
July 8, 2024 20:31 1m 12s
Theme manager: limit setContentsMargins to only "dock" + "Contents" n… Label merge conflicts #1400: Commit 3b895a2 pushed by jonoomph
July 8, 2024 19:31 14s delay-show-main-window
delay-show-main-window
July 8, 2024 19:31 14s
Restore widget state after window is shown, since doing this in the c… Label merge conflicts #1399: Commit 06f4591 pushed by jonoomph
July 8, 2024 19:06 13s delay-show-main-window
delay-show-main-window
July 8, 2024 19:06 13s
Move apply_theme to main_window, before restoring geometry and state Label merge conflicts #1398: Commit 906bc93 pushed by jonoomph
July 8, 2024 18:51 11s delay-show-main-window
delay-show-main-window
July 8, 2024 18:51 11s
Removing singleShot timers for window geometry and state restoring, a… Label merge conflicts #1397: Commit 2ebc773 pushed by jonoomph
July 8, 2024 03:00 11s delay-show-main-window
delay-show-main-window
July 8, 2024 03:00 11s
Delay the showing of the main window until all themes are applied fully Label merge conflicts #1396: Commit f28e634 pushed by jonoomph
July 8, 2024 01:51 10s delay-show-main-window
delay-show-main-window
July 8, 2024 01:51 10s
Merge pull request #5573 from OpenShot/theme-manager-refactor Label merge conflicts #1395: Commit db38836 pushed by jonoomph
July 7, 2024 20:48 1m 11s develop
develop
July 7, 2024 20:48 1m 11s
Switch video preview widget background color to use stylesheet and pa… Label merge conflicts #1394: Commit 6edaebd pushed by jonoomph
July 7, 2024 19:18 10s theme-manager-refactor
theme-manager-refactor
July 7, 2024 19:18 10s
Experimental disable video widget theme access for background color Label merge conflicts #1393: Commit 47e6248 pushed by jonoomph
July 7, 2024 16:37 11s theme-manager-refactor
theme-manager-refactor
July 7, 2024 16:37 11s
Refactor ThemeManager: Label merge conflicts #1392: Commit f10ec7d pushed by jonoomph
July 7, 2024 02:38 10s theme-manager-refactor
theme-manager-refactor
July 7, 2024 02:38 10s
Experimental including OLEAUT32.DLL in our app (for testing) Label merge conflicts #1391: Commit cf2df79 pushed by jonoomph
July 6, 2024 22:06 12s windows-experimental-build
windows-experimental-build
July 6, 2024 22:06 12s
Removing QT_SCALE_FACTOR_ROUNDING_POLICY & qwidget arg in launch Label merge conflicts #1390: Commit e1add57 pushed by jonoomph
July 6, 2024 20:29 12s windows-experimental-build
windows-experimental-build
July 6, 2024 20:29 12s
ProTip! You can narrow down the results and go further in time using created:<2024-07-06 or the other filters available.