Skip to content

Actions: elan-ev/studip-opencast-plugin

Actions

Merge conflict check

Actions

Loading...

Show workflow options

Create status badge

check-merge-conflict.yml
568 workflow runs
568 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

changes for the test system Merge conflict check #568: Commit 72363e7 pushed by tgloeggl
August 16, 2024 09:51 14s master
master
August 16, 2024 09:51 14s
clean up migrations, do not use mysql8 incompatible syntax Merge conflict check #567: Commit 48be42f pushed by tgloeggl
August 15, 2024 13:13 16s master
master
August 15, 2024 13:13 16s
Bump axios from 1.7.3 to 1.7.4 (#994) Merge conflict check #566: Commit ccb899f pushed by tgloeggl
August 15, 2024 07:33 9s master
master
August 15, 2024 07:33 9s
update version to 3.0.14 Merge conflict check #565: Commit 154eadd pushed by tgloeggl
August 15, 2024 07:30 2m 13s master
master
August 15, 2024 07:30 2m 13s
Fix default value error (#995) Merge conflict check #564: Commit 886c57d pushed by tgloeggl
August 15, 2024 07:29 2m 11s master
master
August 15, 2024 07:29 2m 11s
Fix default value error Merge conflict check #563: Pull request #995 synchronize by tgloeggl
August 15, 2024 07:28 11s
August 15, 2024 07:28 11s
handle change of database Merge conflict check #562: Commit 42f1439 pushed by tgloeggl
August 15, 2024 07:28 16s issue-993
issue-993
August 15, 2024 07:28 16s
update version Merge conflict check #561: Commit 7d1dd4a pushed by tgloeggl
August 15, 2024 07:28 2m 12s master
master
August 15, 2024 07:28 2m 12s
Fix default value error Merge conflict check #560: Pull request #995 synchronize by tgloeggl
August 15, 2024 07:27 13s
August 15, 2024 07:27 13s
handle change of database Merge conflict check #559: Commit 1159af1 pushed by tgloeggl
August 15, 2024 07:27 14s issue-993
issue-993
August 15, 2024 07:27 14s
Fix default value error Merge conflict check #558: Pull request #995 opened by tgloeggl
August 15, 2024 07:18 12s
August 15, 2024 07:18 12s
remove default value Merge conflict check #557: Commit 51f8726 pushed by tgloeggl
August 15, 2024 07:17 13s issue-993
issue-993
August 15, 2024 07:17 13s
Bump axios from 1.7.3 to 1.7.4 Merge conflict check #556: Pull request #994 opened by dependabot bot
August 15, 2024 07:17 10s
August 15, 2024 07:17 10s
Bump axios from 1.7.3 to 1.7.4 Merge conflict check #555: Commit 3d7c89a pushed by dependabot bot
August 15, 2024 07:17 11s dependabot/npm_and_yarn/axios-1.7.4
dependabot/npm_and_yarn/axios-1.7.4
August 15, 2024 07:17 11s
Bump braces from 3.0.2 to 3.0.3 in /courseware (#986) Merge conflict check #554: Commit 6a7f1ab pushed by tgloeggl
August 15, 2024 07:16 14s master
master
August 15, 2024 07:16 14s
Add check if server configs exist (#985) Merge conflict check #553: Commit e6c296f pushed by tgloeggl
August 14, 2024 09:20 2m 11s master
master
August 14, 2024 09:20 2m 11s
Fix undefined variable for playlist acl (#982) Merge conflict check #552: Commit 444d2cb pushed by tgloeggl
August 14, 2024 09:20 2m 13s master
master
August 14, 2024 09:20 2m 13s
allow deletion of videso from Stud.IP if they are no present in oc an… Merge conflict check #551: Commit 306f43c pushed by tgloeggl
August 12, 2024 14:23 2m 16s master
master
August 12, 2024 14:23 2m 16s
update package-lock Merge conflict check #550: Commit 7dc7b1e pushed by tgloeggl
August 12, 2024 14:15 3m 1s master
master
August 12, 2024 14:15 3m 1s
Bump braces from 3.0.2 to 3.0.3 in /courseware Merge conflict check #549: Pull request #986 opened by dependabot bot
August 7, 2024 21:12 14s
August 7, 2024 21:12 14s
Bump braces from 3.0.2 to 3.0.3 in /courseware Merge conflict check #548: Commit 1d3def7 pushed by dependabot bot
August 7, 2024 21:12 11s dependabot/npm_and_yarn/courseware/braces-3.0.3
dependabot/npm_and_yarn/courseware/braces-3.0.3
August 7, 2024 21:12 11s
Add check if server configs exist Merge conflict check #547: Pull request #985 opened by dennis531
July 23, 2024 11:50 14s
July 23, 2024 11:50 14s
Fix undefined variable for playlist acl Merge conflict check #546: Pull request #982 opened by dennis531
July 22, 2024 07:42 12s
July 22, 2024 07:42 12s
handle empty acls Merge conflict check #545: Commit 9c9c7a7 pushed by tgloeggl
July 4, 2024 09:51 12s master
master
July 4, 2024 09:51 12s
pass no acl when first creation of oc playlist Merge conflict check #544: Commit 66f84d2 pushed by tgloeggl
July 1, 2024 09:14 11s master
master
July 1, 2024 09:14 11s