Skip to content

Actions: jellyfin/jellyfin-androidtv

Actions

Repo / Label merge conflict

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
repo-merge-conflict.yaml
2,122 workflow runs
2,122 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Restore forced aspect ratio for poster types on video items Repo / Label merge conflict #3356: Commit fe7f0c6 pushed by nielsvanvelzen
October 13, 2024 11:57 13s release-0.17.z
release-0.17.z
October 13, 2024 11:57 13s
Translated using Weblate (Chinese (Simplified Han script)) Repo / Label merge conflict #3355: Commit 1957185 pushed by jellyfin-bot
October 13, 2024 06:41 2m 11s master
master
October 13, 2024 06:41 2m 11s
Translated using Weblate (Slovak) Repo / Label merge conflict #3354: Commit 73384b6 pushed by jellyfin-bot
October 13, 2024 01:41 2m 14s master
master
October 13, 2024 01:41 2m 14s
Translated using Weblate (Persian) Repo / Label merge conflict #3353: Commit 8902e63 pushed by jellyfin-bot
October 12, 2024 20:41 2m 15s master
master
October 12, 2024 20:41 2m 15s
Translated using Weblate (Vietnamese) Repo / Label merge conflict #3352: Commit 288c01b pushed by jellyfin-bot
October 12, 2024 17:41 2m 10s master
master
October 12, 2024 17:41 2m 10s
Remove DeviceUtils Repo / Label merge conflict #3351: Commit bec60ed pushed by nielsvanvelzen
October 12, 2024 13:25 2m 14s master
master
October 12, 2024 13:25 2m 14s
Translated using Weblate (Polish) Repo / Label merge conflict #3350: Commit c509955 pushed by jellyfin-bot
October 12, 2024 11:41 2m 11s master
master
October 12, 2024 11:41 2m 11s
Add preference for default zoom mode (#4020) Repo / Label merge conflict #3349: Commit 24acb71 pushed by nielsvanvelzen
October 12, 2024 09:33 4m 51s master
master
October 12, 2024 09:33 4m 51s
Add preference for default zoom mode Repo / Label merge conflict #3348: Pull request #4020 synchronize by nielsvanvelzen
October 12, 2024 09:29 10s
October 12, 2024 09:29 10s
Translated using Weblate (Polish) Repo / Label merge conflict #3347: Commit e1db052 pushed by jellyfin-bot
October 12, 2024 08:41 2m 15s master
master
October 12, 2024 08:41 2m 15s
Translated using Weblate (Slovak) Repo / Label merge conflict #3346: Commit 84d7639 pushed by jellyfin-bot
October 12, 2024 03:41 2m 11s master
master
October 12, 2024 03:41 2m 11s
Add preference for default zoom mode Repo / Label merge conflict #3345: Pull request #4020 synchronize by JagerSprinkles
October 12, 2024 00:43 10s
October 12, 2024 00:43 10s
Add preference for default zoom mode Repo / Label merge conflict #3344: Pull request #4020 synchronize by JagerSprinkles
October 12, 2024 00:15 12s
October 12, 2024 00:15 12s
Translated using Weblate (Dutch) Repo / Label merge conflict #3343: Commit 8e13a51 pushed by jellyfin-bot
October 11, 2024 23:41 2m 12s master
master
October 11, 2024 23:41 2m 12s
Restore forced aspect ratio for poster types on video items Repo / Label merge conflict #3342: Commit bf4198a pushed by nielsvanvelzen
October 11, 2024 19:45 2m 10s master
master
October 11, 2024 19:45 2m 10s
Update dependency io.mockk:mockk to v1.13.13 Repo / Label merge conflict #3341: Commit dd4bafd pushed by nielsvanvelzen
October 11, 2024 19:45 10s master
master
October 11, 2024 19:45 10s
Update actions/upload-artifact action to v4.4.3 Repo / Label merge conflict #3340: Commit 2d9cdb7 pushed by nielsvanvelzen
October 11, 2024 19:45 2m 10s master
master
October 11, 2024 19:45 2m 10s
Update Kotlin to v2.0.21 Repo / Label merge conflict #3339: Commit f458d3f pushed by nielsvanvelzen
October 11, 2024 19:44 2m 10s master
master
October 11, 2024 19:44 2m 10s
Add "ask to skip" media segment action Repo / Label merge conflict #3338: Commit 0537a20 pushed by nielsvanvelzen
October 11, 2024 19:33 2m 14s master
master
October 11, 2024 19:33 2m 14s
Translated using Weblate (Dutch) Repo / Label merge conflict #3337: Commit 4f23ad4 pushed by jellyfin-bot
October 10, 2024 21:41 2m 10s master
master
October 10, 2024 21:41 2m 10s
Translated using Weblate (Dutch) Repo / Label merge conflict #3336: Commit dede52b pushed by jellyfin-bot
October 10, 2024 19:38 2m 12s master
master
October 10, 2024 19:38 2m 12s
Translated using Weblate (Norwegian Bokmål) Repo / Label merge conflict #3335: Commit 8fe6d80 pushed by jellyfin-bot
October 10, 2024 13:41 2m 14s master
master
October 10, 2024 13:41 2m 14s
Update Kotlin to v2.0.21 Repo / Label merge conflict #3334: Commit 5a5c75f pushed by renovate bot
October 10, 2024 09:40 10s renovate/kotlin
renovate/kotlin
October 10, 2024 09:40 10s
Translated using Weblate (Spanish (Latin America)) Repo / Label merge conflict #3333: Commit 90cc4dc pushed by jellyfin-bot
October 9, 2024 21:41 2m 12s master
master
October 9, 2024 21:41 2m 12s
Don't skip segments shorter than 1 second Repo / Label merge conflict #3332: Commit 961c858 pushed by nielsvanvelzen
October 9, 2024 19:36 2m 11s master
master
October 9, 2024 19:36 2m 11s