Skip to content

Actions: OpenShot/libopenshot

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #975 from OpenShot/choose-profile-v2 Label merge conflicts #842: Commit 09ca2ce pushed by jonoomph
October 12, 2024 20:18 1m 10s develop
develop
October 12, 2024 20:18 1m 10s
Expose the Profile operators to SWIG for comparison Label merge conflicts #841: Commit 178cae4 pushed by jonoomph
October 10, 2024 17:46 13s choose-profile-v2
choose-profile-v2
October 10, 2024 17:46 13s
Adding new Save() method to Profile class, and fix a bug with "descri… Label merge conflicts #840: Commit 6998177 pushed by jonoomph
October 9, 2024 21:18 14s choose-profile-v2
choose-profile-v2
October 9, 2024 21:18 14s
Merge pull request #974 from OpenShot/drag-off-timeline Label merge conflicts #839: Commit 5022ce4 pushed by jonoomph
October 1, 2024 20:09 1m 10s develop
develop
October 1, 2024 20:09 1m 10s
Ensure SetJson() method recalculates project duration (min/max times) Label merge conflicts #838: Commit bc6174f pushed by jonoomph
October 1, 2024 19:54 13s drag-off-timeline
drag-off-timeline
October 1, 2024 19:54 13s
Adding GetMinTime/GetMinFrame functions to timeline, to find the "sta… Label merge conflicts #837: Commit 959947a pushed by jonoomph
September 30, 2024 21:23 11s drag-off-timeline
drag-off-timeline
September 30, 2024 21:23 11s
Merge pull request #973 from OpenShot/drag-off-timeline Label merge conflicts #836: Commit ee58130 pushed by jonoomph
September 24, 2024 20:38 1m 11s develop
develop
September 24, 2024 20:38 1m 11s
Do not add +1 to GetMaxFrame() calculation. This is incorrect math fo… Label merge conflicts #835: Commit 118810f pushed by jonoomph
September 24, 2024 17:41 13s drag-off-timeline
drag-off-timeline
September 24, 2024 17:41 13s
Do not add +1 to GetMaxFrame() calculation. This is incorrect math fo… Label merge conflicts #834: Commit 118810f pushed by jonoomph
September 24, 2024 17:40 15s fix-max-frame-calculation
fix-max-frame-calculation
September 24, 2024 17:40 15s
Merge pull request #972 from OpenShot/better-ffmpeg-support Label merge conflicts #833: Commit d906231 pushed by jonoomph
September 7, 2024 01:32 1m 15s develop
develop
September 7, 2024 01:32 1m 15s
Removing an unneeded avcodec encoder flush, which was breaking many e… Label merge conflicts #832: Commit 5be0f4a pushed by jonoomph
September 6, 2024 22:43 11s better-ffmpeg-support
better-ffmpeg-support
September 6, 2024 22:43 11s
Bump fsfe/reuse-action from 2.0.0 to 4.0.0 Label merge conflicts #831: Commit ea996fc pushed by dependabot bot
July 8, 2024 11:45 14s dependabot/github_actions/fsfe/reuse-action-4.0.0
dependabot/github_actions/fsfe/reuse-action-4.0.0
July 8, 2024 11:45 14s
Merge pull request #968 from OpenShot/release-20240619 Label merge conflicts #830: Commit 044bb22 pushed by jonoomph
June 25, 2024 04:22 1m 13s develop
develop
June 25, 2024 04:22 1m 13s
Bump version to 0.3.3, SO Version 26 Label merge conflicts #829: Commit 3170768 pushed by jonoomph
June 24, 2024 22:21 12s v0.3.3
v0.3.3
June 24, 2024 22:21 12s
Bump version to 0.3.3, SO Version 26 Label merge conflicts #828: Commit 3170768 pushed by jonoomph
June 20, 2024 01:58 11s release-20240619
release-20240619
June 20, 2024 01:58 11s
Bump codecov/codecov-action from 3.1.4 to 4.5.0 Label merge conflicts #827: Commit 793305d pushed by dependabot bot
June 17, 2024 11:37 16s dependabot/github_actions/codecov/codecov-action-4.5.0
dependabot/github_actions/codecov/codecov-action-4.5.0
June 17, 2024 11:37 16s
Merge pull request #966 from OpenShot/java-bindings Label merge conflicts #826: Commit 9424cc0 pushed by jonoomph
June 8, 2024 20:30 1m 9s develop
develop
June 8, 2024 20:30 1m 9s
Remove mac from .github ci, and always built openshot audio. Experime… Label merge conflicts #825: Commit ed145d2 pushed by jonoomph
June 8, 2024 20:15 13s java-bindings
java-bindings
June 8, 2024 20:15 13s
Add experimental support for Java bindings for libopenshot. This gene… Label merge conflicts #824: Commit c889996 pushed by jonoomph
June 8, 2024 19:56 12s java-bindings
java-bindings
June 8, 2024 19:56 12s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.2 Label merge conflicts #823: Commit ffa10d7 pushed by dependabot bot
June 3, 2024 11:32 13s dependabot/github_actions/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/eps1lon/actions-label-merge-conflict-3.0.2
June 3, 2024 11:32 13s
Bump codecov/codecov-action from 3.1.4 to 4.4.1 Label merge conflicts #822: Commit d43a6f7 pushed by dependabot bot
May 27, 2024 11:27 13s dependabot/github_actions/codecov/codecov-action-4.4.1
dependabot/github_actions/codecov/codecov-action-4.4.1
May 27, 2024 11:27 13s
Bump codecov/codecov-action from 3.1.4 to 4.4.0 Label merge conflicts #821: Commit 575435e pushed by dependabot bot
May 20, 2024 11:19 10s dependabot/github_actions/codecov/codecov-action-4.4.0
dependabot/github_actions/codecov/codecov-action-4.4.0
May 20, 2024 11:19 10s
Bump codecov/codecov-action from 3.1.4 to 4.3.1 Label merge conflicts #820: Commit 113d2a3 pushed by dependabot bot
May 13, 2024 11:37 8m 4s dependabot/github_actions/codecov/codecov-action-4.3.1
dependabot/github_actions/codecov/codecov-action-4.3.1
May 13, 2024 11:37 8m 4s
Bump fsfe/reuse-action from 2.0.0 to 3.0.0 Label merge conflicts #819: Commit edf9469 pushed by dependabot bot
May 13, 2024 11:37 6m 54s dependabot/github_actions/fsfe/reuse-action-3.0.0
dependabot/github_actions/fsfe/reuse-action-3.0.0
May 13, 2024 11:37 6m 54s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.1 Label merge conflicts #818: Commit 17f359f pushed by dependabot bot
May 13, 2024 11:37 16s dependabot/github_actions/eps1lon/actions-label-merge-conflict-3.0.1
dependabot/github_actions/eps1lon/actions-label-merge-conflict-3.0.1
May 13, 2024 11:37 16s