Skip to content

Actions: opencast/opencast-admin-interface

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
506 workflow run results
506 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #325 from Arnei/typing-formik-more Merge conflict check #974: Commit cde16a7 pushed by ziegenberg
May 21, 2024 17:30 2m 19s main
main
May 21, 2024 17:30 2m 19s
Better naming for Crowdin workflows Merge conflict check #973: Pull request #407 synchronize by lkiesow
May 21, 2024 17:02 18s
May 21, 2024 17:02 18s
Better naming for Crowdin workflows Merge conflict check #972: Pull request #407 opened by lkiesow
May 21, 2024 16:59 18s
May 21, 2024 16:59 18s
Bump react-i18next from 14.0.1 to 14.1.1 in /app Merge conflict check #971: Pull request #367 synchronize by dependabot bot
May 21, 2024 16:55 16s
May 21, 2024 16:55 16s
Bump react-i18next from 14.0.1 to 14.1.1 in /app Merge conflict check #970: Commit f9c36d2 pushed by dependabot bot
May 21, 2024 16:55 18s dependabot/npm_and_yarn/app/react-i18next-14.1.1
dependabot/npm_and_yarn/app/react-i18next-14.1.1
May 21, 2024 16:55 18s
Bump formik from 2.4.5 to 2.4.6 in /app Merge conflict check #969: Pull request #363 synchronize by dependabot bot
May 21, 2024 16:54 18s
May 21, 2024 16:54 18s
Bump formik from 2.4.5 to 2.4.6 in /app Merge conflict check #968: Commit 186bd0c pushed by dependabot bot
May 21, 2024 16:54 19s dependabot/npm_and_yarn/app/formik-2.4.6
dependabot/npm_and_yarn/app/formik-2.4.6
May 21, 2024 16:54 19s
fix i18n.options.fallbackLng Merge conflict check #967: Pull request #406 opened by ziegenberg
May 21, 2024 16:53 17s
May 21, 2024 16:53 17s
Fix unique key issue in WizzardStepper Merge conflict check #966: Pull request #386 synchronize by ziegenberg
May 21, 2024 16:52 20s
May 21, 2024 16:52 20s
Merge pull request #404 from ziegenberg/fix-admin-ui Merge conflict check #965: Commit 34dd129 pushed by lkiesow
May 21, 2024 16:48 2m 24s main
main
May 21, 2024 16:48 2m 24s
Merge pull request #405 from lkiesow/crowdin-deploy-keys Merge conflict check #964: Commit d4ac7bd pushed by ziegenberg
May 21, 2024 16:48 4m 55s main
main
May 21, 2024 16:48 4m 55s
Automatically deploy new Crowdin keys Merge conflict check #963: Pull request #405 opened by lkiesow
May 21, 2024 16:41 2m 6s
May 21, 2024 16:41 2m 6s
Fix unique key issue in WizzardStepper Merge conflict check #962: Pull request #386 synchronize by ziegenberg
May 21, 2024 16:32 23s
May 21, 2024 16:32 23s
Fix unique key issue in WizzardStepper Merge conflict check #961: Pull request #386 synchronize by ziegenberg
May 21, 2024 16:29 21s
May 21, 2024 16:29 21s
add typing and fix build Merge conflict check #960: Pull request #404 synchronize by ziegenberg
May 21, 2024 16:21 8m 44s
May 21, 2024 16:21 8m 44s
Fix unique key issue in WizzardStepper Merge conflict check #959: Pull request #386 synchronize by ziegenberg
May 21, 2024 16:19 29s
May 21, 2024 16:19 29s
Merge pull request #347 from lkiesow/simple-test Merge conflict check #958: Commit 4e8106c pushed by ziegenberg
May 21, 2024 16:15 2m 37s main
main
May 21, 2024 16:15 2m 37s
Add simple CI test Merge conflict check #957: Pull request #347 synchronize by lkiesow
May 21, 2024 16:09 16m 49s
May 21, 2024 16:09 16m 49s
add typing and fix build Merge conflict check #956: Pull request #404 opened by ziegenberg
May 21, 2024 15:56 4m 17s
May 21, 2024 15:56 4m 17s
Simplify the project structure Merge conflict check #955: Pull request #399 synchronize by JulianKniephoff
May 21, 2024 10:30 12s
May 21, 2024 10:30 12s
Pull the static file server into the CRA proxy as well Merge conflict check #954: Pull request #398 synchronize by JulianKniephoff
May 21, 2024 10:27 13s
May 21, 2024 10:27 13s
Merge pull request #396 from JulianKniephoff/delete-aai-users Merge conflict check #953: Commit f5e91cf pushed by JulianKniephoff
May 21, 2024 10:15 2m 12s main
main
May 21, 2024 10:15 2m 12s
Merge pull request #394 from JulianKniephoff/remove-proxy Merge conflict check #952: Commit 635c448 pushed by JulianKniephoff
May 21, 2024 10:14 2m 17s main
main
May 21, 2024 10:14 2m 17s
Merge pull request #381 from schuettloeffel-elsa/380-add-i18n-for-sub… Merge conflict check #951: Commit 8d89046 pushed by Arnei
May 17, 2024 09:55 2m 15s main
main
May 17, 2024 09:55 2m 15s
dont display ui when logged out Merge conflict check #950: Pull request #401 synchronize by schuettloeffel-elsa
May 17, 2024 07:04 11s
May 17, 2024 07:04 11s