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
47 workflow run results
47 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix #997, correct workflow ordering Merge conflict check #3598: Pull request #1179 opened by JamesUoM
October 4, 2023 14:28 25s
October 4, 2023 14:28 25s
Implement editor locking so only one person can edit a recording a time Merge conflict check #3597: Pull request #1102 synchronize by JamesUoM
October 4, 2023 14:00 16s
October 4, 2023 14:00 16s
Implement editor locking so only one person can edit a recording a time Merge conflict check #3596: Pull request #1102 synchronize by JamesUoM
October 4, 2023 12:50 17s
October 4, 2023 12:50 17s
Bump @types/react from 18.2.21 to 18.2.24 Merge conflict check #3595: Pull request #1177 opened by dependabot bot
October 2, 2023 15:22 15s
October 2, 2023 15:22 15s
Bump @types/react from 18.2.21 to 18.2.24 Merge conflict check #3594: Commit 26de44e pushed by dependabot bot
October 2, 2023 15:22 12s dependabot/npm_and_yarn/types/react-18.2.24
dependabot/npm_and_yarn/types/react-18.2.24
October 2, 2023 15:22 12s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3592: Commit 38fa83e pushed by dependabot bot
October 2, 2023 15:21 19s dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
October 2, 2023 15:21 19s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3593: Pull request #1173 synchronize by dependabot bot
October 2, 2023 15:21 23s
October 2, 2023 15:21 23s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3591: Pull request #1167 synchronize by dependabot bot
October 2, 2023 15:21 16s
October 2, 2023 15:21 16s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3590: Commit c2653f1 pushed by dependabot bot
October 2, 2023 15:21 15s dependabot/npm_and_yarn/luxon-3.4.3
dependabot/npm_and_yarn/luxon-3.4.3
October 2, 2023 15:21 15s
Bump @types/lodash from 4.14.197 to 4.14.199 Merge conflict check #3589: Pull request #1174 synchronize by dependabot bot
October 2, 2023 15:21 2m 14s
October 2, 2023 15:21 2m 14s
Bump @types/lodash from 4.14.197 to 4.14.199 Merge conflict check #3588: Commit 1995060 pushed by dependabot bot
October 2, 2023 15:21 19s dependabot/npm_and_yarn/types/lodash-4.14.199
dependabot/npm_and_yarn/types/lodash-4.14.199
October 2, 2023 15:21 19s
Merge pull request #1176 from opencast/dependabot/npm_and_yarn/playwr… Merge conflict check #3587: Commit fb79f61 pushed by lkiesow
October 2, 2023 15:20 2m 14s main
main
October 2, 2023 15:20 2m 14s
Merge pull request #1175 from opencast/dependabot/npm_and_yarn/i18nex… Merge conflict check #3586: Commit a2e9422 pushed by lkiesow
October 2, 2023 15:20 2m 15s main
main
October 2, 2023 15:20 2m 15s
Add volume control Merge conflict check #3585: Pull request #1060 synchronize by dennis531
October 2, 2023 05:55 10s
October 2, 2023 05:55 10s
Bump @playwright/test from 1.37.1 to 1.38.1 Merge conflict check #3584: Pull request #1176 opened by dependabot bot
October 1, 2023 04:19 1m 28s
October 1, 2023 04:19 1m 28s
Bump @playwright/test from 1.37.1 to 1.38.1 Merge conflict check #3583: Commit 0adb391 pushed by dependabot bot
October 1, 2023 04:19 1m 5s dependabot/npm_and_yarn/playwright/test-1.38.1
dependabot/npm_and_yarn/playwright/test-1.38.1
October 1, 2023 04:19 1m 5s
Bump i18next from 23.4.6 to 23.5.1 Merge conflict check #3582: Commit 5b22d70 pushed by dependabot bot
October 1, 2023 04:18 1m 24s dependabot/npm_and_yarn/i18next-23.5.1
dependabot/npm_and_yarn/i18next-23.5.1
October 1, 2023 04:18 1m 24s
Bump i18next from 23.4.6 to 23.5.1 Merge conflict check #3581: Pull request #1175 opened by dependabot bot
October 1, 2023 04:18 1m 15s
October 1, 2023 04:18 1m 15s
Bump @types/lodash from 4.14.197 to 4.14.199 Merge conflict check #3580: Commit edfdd27 pushed by dependabot bot
October 1, 2023 04:18 1m 16s dependabot/npm_and_yarn/types/lodash-4.14.199
dependabot/npm_and_yarn/types/lodash-4.14.199
October 1, 2023 04:18 1m 16s
Bump @types/lodash from 4.14.197 to 4.14.199 Merge conflict check #3579: Pull request #1174 opened by dependabot bot
October 1, 2023 04:18 1m 6s
October 1, 2023 04:18 1m 6s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3578: Pull request #1173 opened by dependabot bot
October 1, 2023 04:18 44s
October 1, 2023 04:18 44s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3577: Commit f9f9a84 pushed by dependabot bot
October 1, 2023 04:18 39s dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
October 1, 2023 04:18 39s
Bump @types/react-final-form-listeners from 1.0.0 to 1.0.1 Merge conflict check #3575: Pull request #1172 opened by dependabot bot
October 1, 2023 04:17 25s
October 1, 2023 04:17 25s
Bump @types/react-final-form-listeners from 1.0.0 to 1.0.1 Merge conflict check #3576: Commit 25b1a91 pushed by dependabot bot
October 1, 2023 04:17 45s dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.1
dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.1
October 1, 2023 04:17 45s
Bump uuid and @types/uuid Merge conflict check #3573: Pull request #1171 opened by dependabot bot
October 1, 2023 04:17 17s
October 1, 2023 04:17 17s