Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,165 workflow runs
4,165 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add Playlist Sort By Video Duration Conflicts #7746: Pull request #5627 synchronize by Hoverth
September 30, 2024 22:53 11s
September 30, 2024 22:53 11s
Add Playlist Sort By Video Duration Conflicts #7745: Pull request #5627 synchronize by Hoverth
September 30, 2024 22:50 15s
September 30, 2024 22:50 15s
Fix loading from search cache failing when no features are selected Conflicts #7744: Pull request #5775 synchronize by absidue
September 30, 2024 16:37 13s
September 30, 2024 16:37 13s
Revert "Larger search/URL bar (#5348)" Conflicts #7743: Commit d636636 pushed by efb4f5ff-1298-471a-8973-3d47447115dc
September 30, 2024 15:51 10s revert-5348-feat/large-search-bar
revert-5348-feat/large-search-bar
September 30, 2024 15:51 10s
Bump lefthook from 1.7.15 to 1.7.17 (#5768) Conflicts #7742: Commit b3f92e3 pushed by FreeTubeBot
September 30, 2024 15:36 2m 13s development
development
September 30, 2024 15:36 2m 13s
Bump webpack from 5.94.0 to 5.95.0 (#5770) Conflicts #7741: Commit 36df911 pushed by FreeTubeBot
September 30, 2024 15:36 2m 17s development
development
September 30, 2024 15:36 2m 17s
Bump sass from 1.79.3 to 1.79.4 (#5771) Conflicts #7740: Commit c28f575 pushed by FreeTubeBot
September 30, 2024 15:35 2m 14s development
development
September 30, 2024 15:35 2m 14s
Add Playlist Sort By Video Duration Conflicts #7739: Pull request #5627 synchronize by Hoverth
September 30, 2024 08:23 14s
September 30, 2024 08:23 14s
Add Playlist Sort By Video Duration Conflicts #7738: Pull request #5627 synchronize by Hoverth
September 30, 2024 08:19 11s
September 30, 2024 08:19 11s
Bump sass from 1.79.3 to 1.79.4 Conflicts #7737: Commit 57f52b2 pushed by dependabot bot
September 30, 2024 08:09 11s dependabot/npm_and_yarn/sass-1.79.4
dependabot/npm_and_yarn/sass-1.79.4
September 30, 2024 08:09 11s
Bump webpack from 5.94.0 to 5.95.0 Conflicts #7736: Commit 87214fa pushed by dependabot bot
September 30, 2024 08:08 10s dependabot/npm_and_yarn/webpack-5.95.0
dependabot/npm_and_yarn/webpack-5.95.0
September 30, 2024 08:08 10s
Bump shaka-player from 4.11.4 to 4.11.7 Conflicts #7735: Commit b253af0 pushed by dependabot bot
September 30, 2024 08:08 10s dependabot/npm_and_yarn/shaka-player-4.11.7
dependabot/npm_and_yarn/shaka-player-4.11.7
September 30, 2024 08:08 10s
Bump lefthook from 1.7.15 to 1.7.17 Conflicts #7734: Commit ef863e7 pushed by dependabot bot
September 30, 2024 08:08 13s dependabot/npm_and_yarn/lefthook-1.7.17
dependabot/npm_and_yarn/lefthook-1.7.17
September 30, 2024 08:08 13s
Add Playlist Sort By Video Duration Conflicts #7733: Pull request #5627 synchronize by Hoverth
September 30, 2024 05:32 10s
September 30, 2024 05:32 10s
Add Playlist Sort By Video Duration Conflicts #7732: Pull request #5627 synchronize by Hoverth
September 30, 2024 05:19 13s
September 30, 2024 05:19 13s
Translated using Weblate (Chinese (Traditional Han script)) Conflicts #7731: Commit b38a7c1 pushed by weblate
September 30, 2024 03:15 2m 20s development
development
September 30, 2024 03:15 2m 20s
Change the Proxy Videos Through Invidious setting to only apply when … Conflicts #7730: Commit 8e34d19 pushed by FreeTubeBot
September 30, 2024 01:52 2m 16s development
development
September 30, 2024 01:52 2m 16s
Support copying post links from the context menu (#5760) Conflicts #7729: Commit d12901a pushed by FreeTubeBot
September 30, 2024 01:49 2m 15s development
development
September 30, 2024 01:49 2m 15s
Local API: Fix error when a community post has no likes (#5759) Conflicts #7728: Commit 9fe5d89 pushed by FreeTubeBot
September 30, 2024 01:46 2m 13s development
development
September 30, 2024 01:46 2m 13s
Translated using Weblate (English (United Kingdom)) Conflicts #7727: Commit ca4b653 pushed by weblate
September 29, 2024 21:15 2m 15s development
development
September 29, 2024 21:15 2m 15s
Translated using Weblate (Swedish) Conflicts #7726: Commit a11a7f3 pushed by weblate
September 29, 2024 16:16 2m 12s development
development
September 29, 2024 16:16 2m 12s
Add Playlist Sort By Video Duration Conflicts #7725: Pull request #5627 synchronize by Hoverth
September 29, 2024 10:58 10s
September 29, 2024 10:58 10s
Do not overwrite cache entries when hitting RSS ratelimits (#5756) Conflicts #7724: Commit 748e979 pushed by FreeTubeBot
September 29, 2024 10:22 2m 16s development
development
September 29, 2024 10:22 2m 16s
Translated using Weblate (Czech) Conflicts #7723: Commit 6f3748d pushed by weblate
September 29, 2024 10:15 2m 15s development
development
September 29, 2024 10:15 2m 15s
Translated using Weblate (Italian) Conflicts #7722: Commit 17c455f pushed by weblate
September 29, 2024 01:15 2m 15s development
development
September 29, 2024 01:15 2m 15s