Skip to content

Actions: UoM-Podcast/opencast-editor

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
48 workflow runs
48 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[Snyk] Upgrade @mui/material from 5.15.19 to 5.15.20 Merge conflict check #97: Pull request #7 opened by JamesUoM
July 3, 2024 22:17 39s
July 3, 2024 22:17 39s
fix: upgrade @mui/material from 5.15.19 to 5.15.20 Merge conflict check #96: Commit 42ab996 pushed by JamesUoM
July 3, 2024 22:17 40s snyk-upgrade-9f190eda78c5f3f3e2bd7227dc7520a1
snyk-upgrade-9f190eda78c5f3f3e2bd7227dc7520a1
July 3, 2024 22:17 40s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #95: Commit 44afe77 pushed by JamesUoM
July 3, 2024 22:17 40s snyk-upgrade-9f190eda78c5f3f3e2bd7227dc7520a1
snyk-upgrade-9f190eda78c5f3f3e2bd7227dc7520a1
July 3, 2024 22:17 40s
[Snyk] Upgrade @testing-library/jest-dom from 6.4.5 to 6.4.6 Merge conflict check #94: Pull request #6 opened by JamesUoM
July 2, 2024 01:09 11s
July 2, 2024 01:09 11s
fix: upgrade @testing-library/jest-dom from 6.4.5 to 6.4.6 Merge conflict check #93: Commit 2a36576 pushed by JamesUoM
July 2, 2024 01:09 13s snyk-upgrade-58f265b5aedafdf60440e081a03373ab
snyk-upgrade-58f265b5aedafdf60440e081a03373ab
July 2, 2024 01:09 13s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #92: Commit 44afe77 pushed by JamesUoM
July 2, 2024 01:09 13s snyk-upgrade-58f265b5aedafdf60440e081a03373ab
snyk-upgrade-58f265b5aedafdf60440e081a03373ab
July 2, 2024 01:09 13s
[Snyk] Upgrade react-player from 2.10.0 to 2.16.0 Merge conflict check #91: Pull request #5 opened by JamesUoM
June 23, 2024 04:32 10s
June 23, 2024 04:32 10s
fix: upgrade react-player from 2.10.0 to 2.16.0 Merge conflict check #90: Commit c95a1c3 pushed by JamesUoM
June 23, 2024 04:32 11s snyk-upgrade-dc21b5d98c567bfc370124da1a2fcdf9
snyk-upgrade-dc21b5d98c567bfc370124da1a2fcdf9
June 23, 2024 04:32 11s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #89: Commit 44afe77 pushed by JamesUoM
June 23, 2024 04:32 14s snyk-upgrade-dc21b5d98c567bfc370124da1a2fcdf9
snyk-upgrade-dc21b5d98c567bfc370124da1a2fcdf9
June 23, 2024 04:32 14s
MAT-545, strip HTML from http error details Merge conflict check #88: Commit 48ecef5 pushed by JamesUoM
June 21, 2024 12:54 15s uom/staging
uom/staging
June 21, 2024 12:54 15s
MAT-545, strip HTML from http error details Merge conflict check #87: Commit 48ecef5 pushed by JamesUoM
June 21, 2024 10:39 10s uom/develop
uom/develop
June 21, 2024 10:39 10s
MAT-540, improve editing done messages Merge conflict check #86: Commit aecdacb pushed by JamesUoM
June 20, 2024 10:39 13s uom/develop
uom/develop
June 20, 2024 10:39 13s
MAT-540, stop field labels wrapping Merge conflict check #85: Commit c5bfa8f pushed by JamesUoM
June 17, 2024 12:08 12s uom/develop
uom/develop
June 17, 2024 12:08 12s
MAT-540, fix end page spacing Merge conflict check #84: Commit 6c3f97f pushed by JamesUoM
June 17, 2024 11:01 14s uom/develop
uom/develop
June 17, 2024 11:01 14s
MAT-538, add Podcasting logo and help button Merge conflict check #83: Commit 4fec0ea pushed by JamesUoM
June 14, 2024 12:21 12s uom/develop
uom/develop
June 14, 2024 12:21 12s
MAT-538, add Podcasting logo and help button Merge conflict check #82: Commit 4fec0ea pushed by JamesUoM
June 14, 2024 12:20 14s f/MAT-538-branding
f/MAT-538-branding
June 14, 2024 12:20 14s
MAT-538, add Podcasting logo Merge conflict check #81: Commit be2a7bb pushed by JamesUoM
June 13, 2024 22:09 11s f/MAT-538-branding
f/MAT-538-branding
June 13, 2024 22:09 11s
Merged main into uom/develop Merge conflict check #80: Commit 9381280 pushed by JamesUoM
June 11, 2024 12:48 13s uom/develop
uom/develop
June 11, 2024 12:48 13s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #79: Commit 44afe77 pushed by JamesUoM
June 11, 2024 09:23 15s main
main
June 11, 2024 09:23 15s
Merge conflict check Merge conflict check #78: by JamesUoM
October 4, 2023 14:24 14s f/sort-workflows
f/sort-workflows
October 4, 2023 14:24 14s
Use react icon for locking Merge conflict check #77: Commit 9a1d8ce pushed by JamesUoM
October 4, 2023 14:00 14s f/editor-lock
f/editor-lock
October 4, 2023 14:00 14s
Use react icon for locking Merge conflict check #76: Commit 2ffcc37 pushed by JamesUoM
October 4, 2023 12:50 18s f/editor-lock
f/editor-lock
October 4, 2023 12:50 18s
Merge pull request #1176 from opencast/dependabot/npm_and_yarn/playwr… Merge conflict check #75: Commit fb79f61 pushed by JamesUoM
October 4, 2023 12:22 14s main
main
October 4, 2023 12:22 14s