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,341 workflow runs
1,341 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix subtitle button height Merge conflict check #4877: Pull request #1524 opened by Arnei
December 19, 2024 10:30 13s
December 19, 2024 10:30 13s
Fix various eslint and typescript complaints Merge conflict check #4876: Pull request #1522 opened by Arnei
December 19, 2024 09:36 15s
December 19, 2024 09:36 15s
Fix workflows not starting Merge conflict check #4875: Pull request #1521 opened by Arnei
December 19, 2024 09:19 12s
December 19, 2024 09:19 12s
Fixes #1512, don't save edits with no clips Merge conflict check #4874: Pull request #1517 synchronize by JamesUoM
December 18, 2024 14:09 12s
December 18, 2024 14:09 12s
Merge branch 'Arnei-appkit-errorboxes' Merge conflict check #4873: Commit cdaf937 pushed by geichelberger
December 17, 2024 11:12 2m 14s main
main
December 17, 2024 11:12 2m 14s
Make use of error boxes from appkit Merge conflict check #4872: Pull request #1392 synchronize by Arnei
December 17, 2024 10:06 15s
December 17, 2024 10:06 15s
Split track selection to video and audio selection Merge conflict check #4871: Pull request #1230 synchronize by Arnei
December 17, 2024 10:04 12s
December 17, 2024 10:04 12s
Bump eslint from 8.56.0 to 9.17.0 Merge conflict check #4870: Pull request #1519 opened by dependabot bot
December 17, 2024 08:54 11s
December 17, 2024 08:54 11s
Bump eslint from 8.56.0 to 9.17.0 Merge conflict check #4869: Commit fcc04c6 pushed by dependabot bot
December 17, 2024 08:54 10s dependabot/npm_and_yarn/eslint-9.17.0
dependabot/npm_and_yarn/eslint-9.17.0
December 17, 2024 08:54 10s
Merge conflict check Merge conflict check #4868: by geichelberger
December 17, 2024 08:53 2m 11s main
main
December 17, 2024 08:53 2m 11s
Merge pull request #1390 from Arnei/appkit-replace-spinner Merge conflict check #4867: Commit 5680817 pushed by geichelberger
December 17, 2024 08:47 2m 16s main
main
December 17, 2024 08:47 2m 16s
Add cue at current time for subtitles Merge conflict check #4866: Pull request #1367 synchronize by Arnei
December 17, 2024 08:19 13s
December 17, 2024 08:19 13s
Make use of error boxes from appkit Merge conflict check #4865: Pull request #1392 synchronize by Arnei
December 17, 2024 08:18 14s
December 17, 2024 08:18 14s
Replace our spinner with appkits spinner Merge conflict check #4864: Pull request #1390 synchronize by Arnei
December 17, 2024 08:16 15s
December 17, 2024 08:16 15s
Merge pull request #1415 from Arnei/createAppAsyncThunk Merge conflict check #4863: Commit 2916425 pushed by geichelberger
December 17, 2024 08:04 13s 2024-12-17
2024-12-17
December 17, 2024 08:04 13s
Split track selection to video and audio selection Merge conflict check #4862: Pull request #1230 synchronize by Arnei
December 17, 2024 08:03 14s
December 17, 2024 08:03 14s
Merge pull request #1415 from Arnei/createAppAsyncThunk Merge conflict check #4861: Commit 2916425 pushed by geichelberger
December 17, 2024 07:41 2m 13s main
main
December 17, 2024 07:41 2m 13s
Merge pull request #1393 from Arnei/appkit-protobutton Merge conflict check #4860: Commit 00bc540 pushed by geichelberger
December 17, 2024 07:32 2m 14s main
main
December 17, 2024 07:32 2m 14s
Update vite to major version 6 Merge conflict check #4859: Pull request #1518 opened by Arnei
December 13, 2024 09:43 15s
December 13, 2024 09:43 15s
Split track selection to video and audio selection Merge conflict check #4858: Pull request #1230 synchronize by Arnei
December 12, 2024 16:32 15s
December 12, 2024 16:32 15s
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