Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump mikefarah/yq from 4.44.3 to 4.44.5 Conflicts #8356: Commit 5818b20 pushed by dependabot bot
November 18, 2024 08:20 12s dependabot/github_actions/mikefarah/yq-4.44.5
dependabot/github_actions/mikefarah/yq-4.44.5
November 18, 2024 08:20 12s
Add warning message to proxy settings Conflicts #8355: Pull request #6099 synchronize by ChunkyProgrammer
November 18, 2024 03:49 14s
November 18, 2024 03:49 14s
Migrate SubscribedChannels view to Composition API Conflicts #8354: Pull request #6131 synchronize by ChunkyProgrammer
November 18, 2024 03:35 15s
November 18, 2024 03:35 15s
IV RSS Subscriptions: properly detect error channels Conflicts #8353: Pull request #4407 synchronize by ChunkyProgrammer
November 18, 2024 03:34 13s
November 18, 2024 03:34 13s
Make seekbar and player controls appear at bottom of video and take full width Conflicts #8352: Pull request #6007 synchronize by ChunkyProgrammer
November 18, 2024 03:33 12s
November 18, 2024 03:33 12s
Local API: Add support for home tab on channels Conflicts #8351: Pull request #6033 synchronize by ChunkyProgrammer
November 18, 2024 03:32 16s
November 18, 2024 03:32 16s
Translated using Weblate (Portuguese) Conflicts #8350: Commit 7d400e0 pushed by weblate
November 18, 2024 02:00 2m 11s development
development
November 18, 2024 02:00 2m 11s
Migrate Post view to Composition API (#6133) Conflicts #8349: Commit 26fda48 pushed by FreeTubeBot
November 17, 2024 21:36 2m 13s development
development
November 17, 2024 21:36 2m 13s
Use dirent.parentPath instead of deprecated .path (#6172) Conflicts #8348: Commit f849565 pushed by FreeTubeBot
November 17, 2024 21:04 2m 14s development
development
November 17, 2024 21:04 2m 14s
Use ESM import for thumbnail_placeholder.svg instead of require (#6174) Conflicts #8347: Commit 9c127ef pushed by FreeTubeBot
November 17, 2024 20:59 2m 12s development
development
November 17, 2024 20:59 2m 12s
Local API: Add support for home tab on channels Conflicts #8346: Pull request #6033 synchronize by ChunkyProgrammer
November 17, 2024 18:08 12s
November 17, 2024 18:08 12s
Local API: Add support for home tab on channels Conflicts #8345: Pull request #6033 synchronize by ChunkyProgrammer
November 17, 2024 17:24 14s
November 17, 2024 17:24 14s
Local API: Add support for home tab on channels Conflicts #8344: Pull request #6033 synchronize by ChunkyProgrammer
November 17, 2024 17:24 2m 12s
November 17, 2024 17:24 2m 12s
Fix cursor hiding when first opening video (#6135) Conflicts #8343: Commit f9736fb pushed by FreeTubeBot
November 17, 2024 13:36 2m 15s development
development
November 17, 2024 13:36 2m 15s
Undo Feature For Remove From Playlist. Conflicts #8342: Pull request #5885 synchronize by Soham456
November 17, 2024 12:47 10s
November 17, 2024 12:47 10s
Undo Feature For Remove From Playlist. Conflicts #8341: Pull request #5885 synchronize by Soham456
November 16, 2024 12:21 15s
November 16, 2024 12:21 15s
Undo Feature For Remove From Playlist. Conflicts #8340: Pull request #5885 synchronize by Soham456
November 16, 2024 11:48 11s
November 16, 2024 11:48 11s
Update 'Only Show Latest Video for Each Channel' setting to handle a custom number of videos per channel Conflicts #8339: Pull request #5901 synchronize by c-ciobanu
November 16, 2024 11:28 16s
November 16, 2024 11:28 16s
Update 'Only Show Latest Video for Each Channel' setting to handle a custom number of videos per channel Conflicts #8338: Pull request #5901 synchronize by c-ciobanu
November 16, 2024 11:23 12s
November 16, 2024 11:23 12s
Bump cross-spawn from 7.0.3 to 7.0.5 (#6173) Conflicts #8337: Commit 2f7c333 pushed by FreeTubeBot
November 16, 2024 10:13 2m 14s development
development
November 16, 2024 10:13 2m 14s
Bump cross-spawn from 7.0.3 to 7.0.5 Conflicts #8336: Commit 51bc9d9 pushed by dependabot bot
November 15, 2024 23:17 9s dependabot/npm_and_yarn/cross-spawn-7.0.5
dependabot/npm_and_yarn/cross-spawn-7.0.5
November 15, 2024 23:17 9s
Bump @eslint/plugin-kit from 0.2.0 to 0.2.3 (#6170) Conflicts #8335: Commit eeb790c pushed by FreeTubeBot
November 15, 2024 23:16 2m 16s development
development
November 15, 2024 23:16 2m 16s
Migrate Post view to Composition API Conflicts #8334: Pull request #6133 synchronize by absidue
November 15, 2024 23:00 12s
November 15, 2024 23:00 12s
Bump @eslint/plugin-kit from 0.2.0 to 0.2.3 Conflicts #8333: Commit f8c6131 pushed by dependabot bot
November 15, 2024 21:14 11s dependabot/npm_and_yarn/eslint/plugin-kit-0.2.3
dependabot/npm_and_yarn/eslint/plugin-kit-0.2.3
November 15, 2024 21:14 11s
Translated using Weblate (Afrikaans) Conflicts #8332: Commit 2fd0170 pushed by weblate
November 15, 2024 19:00 2m 13s development
development
November 15, 2024 19:00 2m 13s