Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Clarify how to add subscriptions Conflicts #7757: Commit 900bfe6 pushed by efb4f5ff-1298-471a-8973-3d47447115dc
October 1, 2024 08:25 12s efb4f5ff-1298-471a-8973-3d47447115dc-5711
efb4f5ff-1298-471a-8973-3d47447115dc-5711
October 1, 2024 08:25 12s
Fix long comments overflowing and breaking the layout (#5774) Conflicts #7756: Commit 6f53def pushed by FreeTubeBot
October 1, 2024 03:43 2m 11s development
development
October 1, 2024 03:43 2m 11s
Make history page remember last query string & search limit Conflicts #7755: Pull request #5192 synchronize by PikachuEXE
October 1, 2024 03:34 13s
October 1, 2024 03:34 13s
Cleanup unused code in the store (#5776) Conflicts #7754: Commit 2e7ae3b pushed by FreeTubeBot
October 1, 2024 02:35 2m 18s development
development
October 1, 2024 02:35 2m 18s
Revert "Larger search/URL bar (#5348)" (#5773) Conflicts #7753: Commit 5737ed9 pushed by FreeTubeBot
October 1, 2024 02:11 2m 15s development
development
October 1, 2024 02:11 2m 15s
IV: Display video tags in search results Conflicts #7752: Pull request #5590 synchronize by ChunkyProgrammer
October 1, 2024 02:05 9s
October 1, 2024 02:05 9s
Fix loading from search cache failing when no features are selected (… Conflicts #7751: Commit bb54eb2 pushed by FreeTubeBot
October 1, 2024 02:05 13s development
development
October 1, 2024 02:05 13s
IV RSS Subscriptions: properly detect error channels Conflicts #7750: Pull request #4407 synchronize by ChunkyProgrammer
October 1, 2024 02:05 2m 16s
October 1, 2024 02:05 2m 16s
Allow using piped api for comments, playlists, search suggestions and trending Conflicts #7749: Pull request #3559 synchronize by ChunkyProgrammer
October 1, 2024 02:04 11s
October 1, 2024 02:04 11s
Use constants for API names Conflicts #7748: Pull request #5693 synchronize by ChunkyProgrammer
October 1, 2024 02:04 2m 13s
October 1, 2024 02:04 2m 13s
Upgrade eslint 8 > 9 Conflicts #7747: Pull request #5777 synchronize by PikachuEXE
October 1, 2024 02:02 11s
October 1, 2024 02:02 11s
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