Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
405 workflow runs
405 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'upgrade/electron-26' into custom-builds/electron-26 Conflicts #363: Commit 4caef3e pushed by PikachuEXE
September 11, 2023 02:27 14s custom-builds/electron-26
custom-builds/electron-26
September 11, 2023 02:27 14s
* Replace deprecated registerBufferProtocol Conflicts #362: Commit 2c0ec45 pushed by PikachuEXE
September 9, 2023 02:24 15s upgrade/electron-26
upgrade/electron-26
September 9, 2023 02:24 15s
Merge branch 'feature/playlist-2023-05' into custom-builds/current Conflicts #361: Commit b327efb pushed by PikachuEXE
September 7, 2023 03:06 15s custom-builds/current
custom-builds/current
September 7, 2023 03:06 15s
! Fix prompt style issue caused by old branch changes Conflicts #360: Commit 402af7a pushed by PikachuEXE
September 7, 2023 02:32 14s feature/playlist-2023-05
feature/playlist-2023-05
September 7, 2023 02:32 14s
* Update single playlist view to only show Remove watched videos bt… Conflicts #359: Commit 6aa8e3d pushed by PikachuEXE
September 7, 2023 02:08 12s feature/playlist-2023-05
feature/playlist-2023-05
September 7, 2023 02:08 12s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #358: Commit 42f0355 pushed by PikachuEXE
September 7, 2023 02:05 15s feature/playlist-2023-05
feature/playlist-2023-05
September 7, 2023 02:05 15s
$ Remove unused and unusable playlist code for inserting video IDs in… Conflicts #357: Commit ca0ac8e pushed by PikachuEXE
September 6, 2023 07:49 18s feature/playlist-2023-05
feature/playlist-2023-05
September 6, 2023 07:49 18s
$ Remove unused mapActions entries Conflicts #356: Commit 336c052 pushed by PikachuEXE
September 6, 2023 02:06 14s feature/playlist-2023-05
feature/playlist-2023-05
September 6, 2023 02:06 14s
Merge branch 'development' into upgrade/electron-26 Conflicts #355: Commit 8e0eea0 pushed by PikachuEXE
September 5, 2023 06:30 14s upgrade/electron-26
upgrade/electron-26
September 5, 2023 06:30 14s
! Fix empty playlist thumbnail in single playlist view Conflicts #354: Commit e0348a2 pushed by PikachuEXE
September 5, 2023 02:57 14s feature/playlist-2023-05
feature/playlist-2023-05
September 5, 2023 02:57 14s
Merge branch 'feature/playlist-2023-05' into custom-builds/current Conflicts #353: Commit d252dfd pushed by PikachuEXE
September 5, 2023 01:28 13s custom-builds/current
custom-builds/current
September 5, 2023 01:28 13s
! Fix thumbnail not respecting backend preference Conflicts #352: Commit 4b2ba55 pushed by PikachuEXE
September 5, 2023 01:28 11s feature/playlist-2023-05
feature/playlist-2023-05
September 5, 2023 01:28 11s
* Add playlists sort order for last played at, update it on play Conflicts #351: Commit bdd002a pushed by PikachuEXE
August 30, 2023 02:47 10s feature/playlist-2023-05
feature/playlist-2023-05
August 30, 2023 02:47 10s
* Add more Conflicts #350: Commit 626a791 pushed by PikachuEXE
August 30, 2023 02:01 10s dev/group-dependabot-updates
dev/group-dependabot-updates
August 30, 2023 02:01 10s
! Ensure new playlist button focused after add to playlist prompt clo… Conflicts #349: Commit 454763f pushed by PikachuEXE
August 29, 2023 07:52 10s feature/playlist-2023-05
feature/playlist-2023-05
August 29, 2023 07:52 10s
Merge branch 'feature/playlist-2023-05' into custom-builds/current Conflicts #348: Commit aaf5f03 pushed by PikachuEXE
August 29, 2023 07:17 13s custom-builds/current
custom-builds/current
August 29, 2023 07:17 13s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #347: Commit 4b21e75 pushed by PikachuEXE
August 29, 2023 07:15 12s feature/playlist-2023-05
feature/playlist-2023-05
August 29, 2023 07:15 12s
* Update add to playlist prompt to add sort options Conflicts #346: Commit 433eb0d pushed by PikachuEXE
August 29, 2023 06:58 15s feature/playlist-2023-05
feature/playlist-2023-05
August 29, 2023 06:58 15s
* Add group for @fortawesome/* Conflicts #345: Commit c52f75a pushed by PikachuEXE
August 29, 2023 06:33 14s dev/group-dependabot-updates
dev/group-dependabot-updates
August 29, 2023 06:33 14s
* Replace deprecated registerBufferProtocol Conflicts #344: Commit e5ae387 pushed by PikachuEXE
August 29, 2023 02:04 11s upgrade/electron-26
upgrade/electron-26
August 29, 2023 02:04 11s
~ Remove unnecessary eslint disable comment Conflicts #343: Commit d9d91d7 pushed by PikachuEXE
August 29, 2023 02:04 14s upgrade/electron-26
upgrade/electron-26
August 29, 2023 02:04 14s
* Update dependabot config to group updates for some packages in fewe… Conflicts #342: Commit 624b54b pushed by PikachuEXE
August 29, 2023 01:32 13s dev/group-dependabot-updates
dev/group-dependabot-updates
August 29, 2023 01:32 13s
* Replace deprecated registerBufferProtocol Conflicts #341: Commit 02411bf pushed by PikachuEXE
August 29, 2023 01:25 12s upgrade/electron-26
upgrade/electron-26
August 29, 2023 01:25 12s
* Replace deprecated registerBufferProtocol Conflicts #340: Commit e1f5da1 pushed by PikachuEXE
August 29, 2023 01:20 13s upgrade/electron-26
upgrade/electron-26
August 29, 2023 01:20 13s
! Fix unable to visit previous video when playing first video in a pl… Conflicts #339: Commit 4eaf0e2 pushed by PikachuEXE
August 29, 2023 00:46 13s feature/playlist-2023-05
feature/playlist-2023-05
August 29, 2023 00:46 13s
ProTip! You can narrow down the results and go further in time using created:<2023-08-29 or the other filters available.