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

Bump @types/uuid from 9.0.4 to 9.0.6 Merge conflict check #3677: Pull request #1194 opened by dependabot bot
November 1, 2023 04:26 15s
November 1, 2023 04:26 15s
Bump @types/uuid from 9.0.4 to 9.0.6 Merge conflict check #3676: Commit 8f32908 pushed by dependabot bot
November 1, 2023 04:26 15s dependabot/npm_and_yarn/types/uuid-9.0.6
dependabot/npm_and_yarn/types/uuid-9.0.6
November 1, 2023 04:26 15s
Bump @types/lodash from 4.14.199 to 4.14.200 Merge conflict check #3675: Pull request #1193 opened by dependabot bot
November 1, 2023 04:25 15s
November 1, 2023 04:25 15s
Bump @types/lodash from 4.14.199 to 4.14.200 Merge conflict check #3674: Commit 4bf54ee pushed by dependabot bot
November 1, 2023 04:25 13s dependabot/npm_and_yarn/types/lodash-4.14.200
dependabot/npm_and_yarn/types/lodash-4.14.200
November 1, 2023 04:25 13s
Bump @mui/material from 5.14.7 to 5.14.16 Merge conflict check #3673: Pull request #1192 opened by dependabot bot
November 1, 2023 04:25 13s
November 1, 2023 04:25 13s
Bump @mui/material from 5.14.7 to 5.14.16 Merge conflict check #3672: Commit 0cfc5ac pushed by dependabot bot
November 1, 2023 04:25 11s dependabot/npm_and_yarn/mui/material-5.14.16
dependabot/npm_and_yarn/mui/material-5.14.16
November 1, 2023 04:25 11s
Bump react-select from 5.7.4 to 5.7.7 Merge conflict check #3671: Pull request #1191 opened by dependabot bot
November 1, 2023 04:24 12s
November 1, 2023 04:24 12s
Bump react-select from 5.7.4 to 5.7.7 Merge conflict check #3670: Commit 31d4ed3 pushed by dependabot bot
November 1, 2023 04:24 11s dependabot/npm_and_yarn/react-select-5.7.7
dependabot/npm_and_yarn/react-select-5.7.7
November 1, 2023 04:24 11s
Bump @types/luxon from 3.3.2 to 3.3.3 Merge conflict check #3669: Pull request #1190 opened by dependabot bot
November 1, 2023 04:24 13s
November 1, 2023 04:24 13s
Bump @types/luxon from 3.3.2 to 3.3.3 Merge conflict check #3668: Commit 6cb638c pushed by dependabot bot
November 1, 2023 04:24 11s dependabot/npm_and_yarn/types/luxon-3.3.3
dependabot/npm_and_yarn/types/luxon-3.3.3
November 1, 2023 04:24 11s
Merge pull request #1185 from Pavol-Beskid/download-subtitle-files Merge conflict check #3667: Commit 6757d7e pushed by Arnei
October 31, 2023 19:30 2m 11s main
main
October 31, 2023 19:30 2m 11s
Merge pull request #1187 from maheshchandra10/incorrect-icon-color-of… Merge conflict check #3666: Commit 9e99dc3 pushed by Arnei
October 31, 2023 19:25 2m 15s main
main
October 31, 2023 19:25 2m 15s
Merge pull request #1183 from Arnei/subtitle-not-saved-on-process Merge conflict check #3665: Commit cd48d62 pushed by KatrinIhler
October 27, 2023 16:11 2m 14s main
main
October 27, 2023 16:11 2m 14s
Fix #1186, incorrect color of btn icons on hover Merge conflict check #3664: Pull request #1187 opened by maheshchandra10
October 26, 2023 13:13 15s
October 26, 2023 13:13 15s
Download subtitle files Merge conflict check #3663: Pull request #1185 opened by Pavol-Beskid
October 25, 2023 16:49 13s
October 25, 2023 16:49 13s
Fix subtitles not being saved to Opencast Merge conflict check #3662: Pull request #1183 opened by Arnei
October 20, 2023 11:41 18s
October 20, 2023 11:41 18s
Automatically update translation keys Merge conflict check #3661: Commit 411f4ad pushed by Arnei
October 17, 2023 06:25 2m 14s 2023-10-17
2023-10-17
October 17, 2023 06:25 2m 14s
Revert "Change subtitle identification from flavor to id" Merge conflict check #3660: Commit fe3cd29 pushed by Arnei
October 5, 2023 15:19 17s 2023-10-05
2023-10-05
October 5, 2023 15:19 17s
Revert "Change subtitle identification from flavor to id" Merge conflict check #3659: Commit fe3cd29 pushed by Arnei
October 5, 2023 15:16 13s release-for-oc-14.5
release-for-oc-14.5
October 5, 2023 15:16 13s
Merge pull request #1181 from opencast/dependabot/npm_and_yarn/reduxj… Merge conflict check #3658: Commit 9685fcf pushed by Arnei
October 5, 2023 15:15 14s release-for-oc-14.5
release-for-oc-14.5
October 5, 2023 15:15 14s
More small screen responsiveness Merge conflict check #3657: Pull request #1160 synchronize by Arnei
October 5, 2023 10:28 16s
October 5, 2023 10:28 16s
Merge pull request #1181 from opencast/dependabot/npm_and_yarn/reduxj… Merge conflict check #3656: Commit 9685fcf pushed by Arnei
October 5, 2023 10:02 2m 12s main
main
October 5, 2023 10:02 2m 12s
Merge pull request #1172 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3655: Commit 324ced7 pushed by Arnei
October 5, 2023 10:01 2m 17s main
main
October 5, 2023 10:01 2m 17s
Merge pull request #1179 from UoM-Podcast/f/sort-workflows Merge conflict check #3654: Commit fed8678 pushed by Arnei
October 5, 2023 09:37 2m 17s main
main
October 5, 2023 09:37 2m 17s
Bump @types/react-final-form-listeners from 1.0.0 to 1.0.1 Merge conflict check #3653: Pull request #1172 synchronize by dependabot bot
October 5, 2023 09:30 22s
October 5, 2023 09:30 22s
ProTip! You can narrow down the results and go further in time using created:<2023-10-05 or the other filters available.