Skip to content

Actions: elan-ev/tobira

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add initial support for Matomo data collection via Paella player Merge conflict check #2389: Pull request #1099 opened by LukasKalbertodt
February 6, 2024 16:30 13s
February 6, 2024 16:30 13s
Add logging of useful DB server information (#1089) Merge conflict check #2388: Commit 604044e pushed by owi92
February 5, 2024 12:10 2m 10s master
master
February 5, 2024 12:10 2m 10s
Add granular permissions to the realm tree Merge conflict check #2387: Pull request #1097 opened by owi92
February 5, 2024 09:59 10s
February 5, 2024 09:59 10s
Make auth system more flexible & convenient and add "callbacks" Merge conflict check #2386: Pull request #1032 synchronize by LukasKalbertodt
February 1, 2024 13:29 11s
February 1, 2024 13:29 11s
Make auth system more flexible & convenient and add "callbacks" Merge conflict check #2385: Pull request #1032 synchronize by LukasKalbertodt
February 1, 2024 13:01 12s
February 1, 2024 13:01 12s
Make auth system more flexible & convenient and add "callbacks" Merge conflict check #2384: Pull request #1032 synchronize by LukasKalbertodt
February 1, 2024 12:32 10s
February 1, 2024 12:32 10s
Improve UI tests by running each in isolation (separate Tobira process & DB) with fixed offline data Merge conflict check #2383: Pull request #1093 synchronize by LukasKalbertodt
January 25, 2024 16:34 11s
January 25, 2024 16:34 11s
Improve UI tests by running each in isolation (separate Tobira process & DB) with fixed offline data Merge conflict check #2382: Pull request #1093 opened by LukasKalbertodt
January 23, 2024 12:36 12s
January 23, 2024 12:36 12s
Fix routing after adding sub-realms (#1092) Merge conflict check #2381: Commit bb4e980 pushed by LukasKalbertodt
January 23, 2024 08:45 2m 10s master
master
January 23, 2024 08:45 2m 10s
Fix routing after adding sub-realms Merge conflict check #2380: Pull request #1092 opened by owi92
January 22, 2024 17:26 13s
January 22, 2024 17:26 13s
Bump h2 from 0.3.21 to 0.3.24 in /util/loadtest (#1091) Merge conflict check #2379: Commit 726b736 pushed by LukasKalbertodt
January 22, 2024 10:02 2m 11s master
master
January 22, 2024 10:02 2m 11s
Bump h2 from 0.3.21 to 0.3.24 in /backend (#1090) Merge conflict check #2378: Commit b2460cd pushed by LukasKalbertodt
January 22, 2024 10:02 2m 14s master
master
January 22, 2024 10:02 2m 14s
Bump h2 from 0.3.21 to 0.3.24 in /util/loadtest Merge conflict check #2377: Pull request #1091 opened by dependabot bot
January 19, 2024 16:19 10s
January 19, 2024 16:19 10s
Bump h2 from 0.3.21 to 0.3.24 in /backend Merge conflict check #2376: Pull request #1090 opened by dependabot bot
January 19, 2024 16:19 12s
January 19, 2024 16:19 12s
Add logging of useful DB server information Merge conflict check #2375: Pull request #1089 opened by LukasKalbertodt
January 18, 2024 13:45 12s
January 18, 2024 13:45 12s
Fix non-direct video links on search page (#1088) Merge conflict check #2374: Commit d13f561 pushed by owi92
January 18, 2024 12:36 2m 11s master
master
January 18, 2024 12:36 2m 11s
Fix non-direct video links on search page Merge conflict check #2373: Pull request #1088 opened by LukasKalbertodt
January 18, 2024 11:07 13s
January 18, 2024 11:07 13s
Make logout button work with keyboard (#1083) Merge conflict check #2372: Commit f9e74e3 pushed by LukasKalbertodt
January 16, 2024 17:57 2m 10s master
master
January 16, 2024 17:57 2m 10s
Make logout button work with keyboard Merge conflict check #2371: Pull request #1083 synchronize by owi92
January 16, 2024 17:48 9s
January 16, 2024 17:48 9s
Add breadcrumbs to series pages (#1085) Merge conflict check #2370: Commit 5b2b320 pushed by LukasKalbertodt
January 16, 2024 17:45 2m 10s master
master
January 16, 2024 17:45 2m 10s
Left align "about tobira" page content (#1084) Merge conflict check #2369: Commit 870ebb5 pushed by LukasKalbertodt
January 16, 2024 17:44 2m 15s master
master
January 16, 2024 17:44 2m 15s
Add breadcrumbs to series pages Merge conflict check #2368: Pull request #1085 synchronize by owi92
January 16, 2024 17:35 13s
January 16, 2024 17:35 13s
Left align "about tobira" page content Merge conflict check #2367: Pull request #1084 synchronize by owi92
January 16, 2024 17:34 10s
January 16, 2024 17:34 10s
Make logout button work with keyboard Merge conflict check #2366: Pull request #1083 synchronize by owi92
January 16, 2024 17:33 10s
January 16, 2024 17:33 10s
Fix CI scripts Merge conflict check #2365: Commit 8b8294a pushed by LukasKalbertodt
January 16, 2024 17:11 2m 11s master
master
January 16, 2024 17:11 2m 11s