Skip to content

Actions: opencast/opencast-editor

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
1,297 workflow runs
1,297 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add typing to async thunks Merge conflict check #4857: Pull request #1415 synchronize by Arnei
December 11, 2024 14:42 17s
December 11, 2024 14:42 17s
Fixes #1512, don't save edits with no clips Merge conflict check #4856: Pull request #1517 synchronize by JamesUoM
December 11, 2024 11:41 12s
December 11, 2024 11:41 12s
Fixes #1512, don't save edits with no clips Merge conflict check #4855: Pull request #1517 opened by JamesUoM
December 11, 2024 11:35 14s
December 11, 2024 11:35 14s
Merge pull request #1511 from geichelberger/delete-subtitles Merge conflict check #4854: Commit 6c2e214 pushed by Arnei
December 11, 2024 08:33 2m 13s main
main
December 11, 2024 08:33 2m 13s
Add typing to async thunks Merge conflict check #4853: Pull request #1415 synchronize by Arnei
December 10, 2024 08:40 10s
December 10, 2024 08:40 10s
Make use of ProtoButton from appkit Merge conflict check #4852: Pull request #1393 synchronize by Arnei
December 10, 2024 08:37 15s
December 10, 2024 08:37 15s
Make use of error boxes from appkit Merge conflict check #4851: Pull request #1392 synchronize by Arnei
December 10, 2024 08:26 12s
December 10, 2024 08:26 12s
Replace our spinner with appkits spinner Merge conflict check #4850: Pull request #1390 synchronize by Arnei
December 10, 2024 08:18 15s
December 10, 2024 08:18 15s
Split track selection to video and audio selection Merge conflict check #4849: Pull request #1230 synchronize by Arnei
December 10, 2024 08:04 12s
December 10, 2024 08:04 12s
Merge pull request #1160 from Arnei/more-small-screen-responsiveness Merge conflict check #4848: Commit ef8aec1 pushed by geichelberger
December 9, 2024 14:43 2m 15s main
main
December 9, 2024 14:43 2m 15s
Add subtitle delete button Merge conflict check #4847: Pull request #1511 synchronize by geichelberger
December 9, 2024 14:06 15s
December 9, 2024 14:06 15s
Merge pull request #1495 from JulianKniephoff/forward-button Merge conflict check #4846: Commit 0b282ae pushed by geichelberger
December 9, 2024 13:30 2m 16s main
main
December 9, 2024 13:30 2m 16s
Merge pull request #1513 from opencast/dependabot/npm_and_yarn/i18nex… Merge conflict check #4845: Commit 6d1dd7b pushed by geichelberger
December 9, 2024 13:24 2m 12s main
main
December 9, 2024 13:24 2m 12s
Merge pull request #1413 from Arnei/refactor-save-button-code Merge conflict check #4844: Commit eeed3c6 pushed by geichelberger
December 9, 2024 09:52 2m 18s main
main
December 9, 2024 09:52 2m 18s
More small screen responsiveness Merge conflict check #4843: Pull request #1160 synchronize by Arnei
December 6, 2024 08:39 10s
December 6, 2024 08:39 10s
Add typing to async thunks Merge conflict check #4842: Pull request #1415 synchronize by Arnei
December 6, 2024 08:34 11s
December 6, 2024 08:34 11s
Make use of ProtoButton from appkit Merge conflict check #4841: Pull request #1393 synchronize by Arnei
December 6, 2024 08:32 11s
December 6, 2024 08:32 11s
Remove duplicate save code Merge conflict check #4840: Pull request #1413 synchronize by Arnei
December 6, 2024 08:30 12s
December 6, 2024 08:30 12s
Make use of error boxes from appkit Merge conflict check #4839: Pull request #1392 synchronize by Arnei
December 6, 2024 08:18 10s
December 6, 2024 08:18 10s
Replace our spinner with appkits spinner Merge conflict check #4838: Pull request #1390 synchronize by Arnei
December 6, 2024 08:10 11s
December 6, 2024 08:10 11s
Split track selection to video and audio selection Merge conflict check #4837: Pull request #1230 synchronize by Arnei
December 6, 2024 08:06 11s
December 6, 2024 08:06 11s
Bump vite from 5.4.10 to 6.0.2 Merge conflict check #4836: Pull request #1515 synchronize by dependabot bot
December 5, 2024 14:16 16s
December 5, 2024 14:16 16s
Bump eslint from 8.56.0 to 9.16.0 Merge conflict check #4835: Pull request #1510 synchronize by dependabot bot
December 5, 2024 14:16 13s
December 5, 2024 14:16 13s
Bump vite from 5.4.10 to 6.0.2 Merge conflict check #4834: Commit f06a212 pushed by dependabot bot
December 5, 2024 14:16 14s dependabot/npm_and_yarn/vite-6.0.2
dependabot/npm_and_yarn/vite-6.0.2
December 5, 2024 14:16 14s
Bump eslint from 8.56.0 to 9.16.0 Merge conflict check #4833: Commit 8d90cb4 pushed by dependabot bot
December 5, 2024 14:16 13s dependabot/npm_and_yarn/eslint-9.16.0
dependabot/npm_and_yarn/eslint-9.16.0
December 5, 2024 14:16 13s