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
1,897 workflow runs
1,897 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add Random Sort Repo / Label merge conflict #4080: Pull request #4568 synchronize by mehmetu61
April 9, 2025 06:41 7s
April 9, 2025 06:41 7s
Update CI dependencies Repo / Label merge conflict #4079: Pull request #4570 synchronize by renovate bot
April 9, 2025 04:51 10s
April 9, 2025 04:51 10s
Update CI dependencies Repo / Label merge conflict #4078: Commit ab0a486 pushed by renovate bot
April 9, 2025 04:51 7s renovate/ci-deps
renovate/ci-deps
April 9, 2025 04:51 7s
Translated using Weblate (Portuguese) Repo / Label merge conflict #4077: Commit f9009b1 pushed by jellyfin-bot
April 8, 2025 18:01 2m 10s master
master
April 8, 2025 18:01 2m 10s
Update Kotlin Repo / Label merge conflict #4076: Pull request #4250 synchronize by renovate bot
April 8, 2025 09:02 10s
April 8, 2025 09:02 10s
Update Kotlin Repo / Label merge conflict #4075: Commit 32fc174 pushed by renovate bot
April 8, 2025 09:02 7s renovate/kotlin
renovate/kotlin
April 8, 2025 09:02 7s
Update CI dependencies Repo / Label merge conflict #4074: Pull request #4570 synchronize by renovate bot
April 8, 2025 00:34 10s
April 8, 2025 00:34 10s
Update github/codeql-action action to v3.28.15 Repo / Label merge conflict #4073: Commit ab8074b pushed by renovate bot
April 8, 2025 00:34 10s renovate/ci-deps
renovate/ci-deps
April 8, 2025 00:34 10s
Add Random Sort Repo / Label merge conflict #4072: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:49 9s
April 7, 2025 19:49 9s
Add Random Sort Repo / Label merge conflict #4071: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:49 8s
April 7, 2025 19:49 8s
Add Random Sort Repo / Label merge conflict #4070: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:48 8s
April 7, 2025 19:48 8s
Add Random Sort Repo / Label merge conflict #4069: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:47 10s
April 7, 2025 19:47 10s
Add Random Sort Repo / Label merge conflict #4068: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:46 10s
April 7, 2025 19:46 10s
Add Random Sort Repo / Label merge conflict #4067: Pull request #4568 synchronize by mehmetu61
April 7, 2025 19:43 9s
April 7, 2025 19:43 9s
Update github/codeql-action action to v3.28.14 Repo / Label merge conflict #4066: Commit ac8bcf4 pushed by renovate bot
April 7, 2025 14:48 8s renovate/ci-deps
renovate/ci-deps
April 7, 2025 14:48 8s
Added translation using Weblate (Galician) Repo / Label merge conflict #4065: Commit 32017d1 pushed by jellyfin-bot
April 7, 2025 12:57 2m 10s master
master
April 7, 2025 12:57 2m 10s
Translated using Weblate (Czech) Repo / Label merge conflict #4064: Commit f380de5 pushed by jellyfin-bot
April 7, 2025 12:01 2m 10s master
master
April 7, 2025 12:01 2m 10s
Translated using Weblate (Portuguese (Portugal)) Repo / Label merge conflict #4063: Commit b4a9b97 pushed by jellyfin-bot
April 6, 2025 11:01 2m 10s master
master
April 6, 2025 11:01 2m 10s
Fix time formatting in toolbar, merge duplicate rememberCurrentTime i… Repo / Label merge conflict #4062: Commit da8f1e1 pushed by nielsvanvelzen
April 6, 2025 05:58 2m 11s master
master
April 6, 2025 05:58 2m 11s
Update dependency org.jellyfin.sdk:jellyfin-core to v1.6.8 Repo / Label merge conflict #4061: Commit 7636916 pushed by nielsvanvelzen
April 5, 2025 20:00 2m 9s master
master
April 5, 2025 20:00 2m 9s
Update dependency org.jellyfin.sdk:jellyfin-core to v1.6.8 Repo / Label merge conflict #4060: Commit 6135926 pushed by renovate bot
April 5, 2025 19:56 8s renovate/jellyfin.sdk
renovate/jellyfin.sdk
April 5, 2025 19:56 8s
Fix tinting of user switch button in HomeToolbar Repo / Label merge conflict #4059: Commit 545aeed pushed by nielsvanvelzen
April 4, 2025 20:45 2m 8s master
master
April 4, 2025 20:45 2m 8s
Add ButtonColors and colorScheme Repo / Label merge conflict #4058: Pull request #4563 synchronize by nielsvanvelzen
April 4, 2025 19:39 7s
April 4, 2025 19:39 7s
Add still watching feature Repo / Label merge conflict #4057: Pull request #4509 synchronize by ConnorS1110
April 4, 2025 05:11 8s
April 4, 2025 05:11 8s
Rewrite toolbar in compose Repo / Label merge conflict #4056: Commit 719de0f pushed by nielsvanvelzen
April 3, 2025 20:35 2m 10s master
master
April 3, 2025 20:35 2m 10s