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

Filter by Event

Loading

Filter by Status

Loading

Filter by Branch

Loading

Filter by Actor

Loading
chore(deps): update github/codeql-action action to v3.25.13 Repo / Label merge conflict #2904: Commit cbcaea6 pushed by nielsvanvelzen
July 19, 2024 18:28 12s v0.17.0-beta.4
v0.17.0-beta.4
July 19, 2024 18:28 12s
chore(deps): update github/codeql-action action to v3.25.13 Repo / Label merge conflict #2903: Commit cbcaea6 pushed by nielsvanvelzen
July 19, 2024 18:19 14s release-0.17.z
release-0.17.z
July 19, 2024 18:19 14s
chore(deps): update github/codeql-action action to v3.25.13 Repo / Label merge conflict #2902: Commit cbcaea6 pushed by nielsvanvelzen
July 19, 2024 18:16 2m 15s master
master
July 19, 2024 18:16 2m 15s
chore(deps): update github/codeql-action action to v3.25.13 Repo / Label merge conflict #2901: Commit 3e4a0c3 pushed by renovate bot
July 19, 2024 17:08 9s renovate/ci-deps
renovate/ci-deps
July 19, 2024 17:08 9s
Translated using Weblate (Hungarian) Repo / Label merge conflict #2900: Commit cb7054f pushed by jellyfin-bot
July 19, 2024 10:41 2m 11s master
master
July 19, 2024 10:41 2m 11s
Replace all left-over Date usages with java.time Repo / Label merge conflict #2899: Commit 3170670 pushed by nielsvanvelzen
July 18, 2024 18:55 2m 13s master
master
July 18, 2024 18:55 2m 13s
Replace all left-over Date usages with java.time Repo / Label merge conflict #2898: Pull request #3767 synchronize by nielsvanvelzen
July 17, 2024 20:13 13s
July 17, 2024 20:13 13s
fix(deps): update dependency io.coil-kt:coil-base to v2.7.0 Repo / Label merge conflict #2897: Commit ad18e5b pushed by nielsvanvelzen
July 17, 2024 18:32 2m 13s master
master
July 17, 2024 18:32 2m 13s
fix(deps): update dependency io.coil-kt:coil-base to v2.7.0 Repo / Label merge conflict #2896: Commit 0ce8387 pushed by renovate bot
July 17, 2024 17:54 11s renovate/coil
renovate/coil
July 17, 2024 17:54 11s
Translated using Weblate (Belarusian) Repo / Label merge conflict #2895: Commit 6310964 pushed by jellyfin-bot
July 17, 2024 10:41 2m 12s master
master
July 17, 2024 10:41 2m 12s
Translated using Weblate (Belarusian) Repo / Label merge conflict #2894: Commit 08345f2 pushed by jellyfin-bot
July 16, 2024 21:41 2m 11s master
master
July 16, 2024 21:41 2m 11s
Translated using Weblate (Belarusian) Repo / Label merge conflict #2893: Commit 80cb709 pushed by jellyfin-bot
July 16, 2024 18:41 2m 13s master
master
July 16, 2024 18:41 2m 13s
Update translation files Repo / Label merge conflict #2892: Commit 5900197 pushed by jellyfin-bot
July 16, 2024 15:41 2m 15s master
master
July 16, 2024 15:41 2m 15s
Remove unused compat streaminfo code Repo / Label merge conflict #2891: Commit 1c80f6e pushed by nielsvanvelzen
July 16, 2024 13:37 2m 12s master
master
July 16, 2024 13:37 2m 12s
Fix timezone issues in Live TV guide Repo / Label merge conflict #2890: Commit 5891264 pushed by nielsvanvelzen
July 16, 2024 12:46 1m 33s master
master
July 16, 2024 12:46 1m 33s
Translated using Weblate (Filipino) Repo / Label merge conflict #2889: Commit f5e1b18 pushed by jellyfin-bot
July 16, 2024 12:41 5m 11s master
master
July 16, 2024 12:41 5m 11s
Fix timezone issues in Live TV guide Repo / Label merge conflict #2888: Pull request #3761 synchronize by nielsvanvelzen
July 16, 2024 12:40 11s
July 16, 2024 12:40 11s
Set HTTP timeouts in VideoManager ExoPlayer Repo / Label merge conflict #2887: Commit 181bb62 pushed by nielsvanvelzen
July 16, 2024 12:26 14m 41s master
master
July 16, 2024 12:26 14m 41s
Update dependency io.mockk:mockk to v1.13.12 Repo / Label merge conflict #2886: Commit 93272f4 pushed by nielsvanvelzen
July 16, 2024 11:57 2m 14s master
master
July 16, 2024 11:57 2m 14s
Update gradle/actions action to v3.5.0 Repo / Label merge conflict #2885: Commit 9e3a81d pushed by nielsvanvelzen
July 16, 2024 11:56 2m 12s master
master
July 16, 2024 11:56 2m 12s
Tweak formatting Repo / Label merge conflict #2884: Commit 801c043 pushed by nielsvanvelzen
July 16, 2024 11:54 2m 19s master
master
July 16, 2024 11:54 2m 19s
Improve BlurHash decoding performance Repo / Label merge conflict #2883: Pull request #3753 synchronize by nielsvanvelzen
July 16, 2024 11:50 11s
July 16, 2024 11:50 11s
Update editor config Repo / Label merge conflict #2882: Commit 96174e5 pushed by nielsvanvelzen
July 16, 2024 11:37 2m 15s master
master
July 16, 2024 11:37 2m 15s
Improve BlurHash decoding performance Repo / Label merge conflict #2881: Pull request #3753 synchronize by cbeyls
July 15, 2024 21:54 10s
July 15, 2024 21:54 10s
Improve BlurHash decoding performance Repo / Label merge conflict #2880: Pull request #3753 synchronize by cbeyls
July 15, 2024 21:52 11s
July 15, 2024 21:52 11s