Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
403 workflow runs
403 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'development' into feature/playlist-2023-05 Conflicts #388: Commit bdb2a94 pushed by PikachuEXE
September 26, 2023 01:36 16s feature/playlist-2023-05
feature/playlist-2023-05
September 26, 2023 01:36 16s
! Fix external player handling for video in local playlist Conflicts #387: Commit 6e9636f pushed by PikachuEXE
September 26, 2023 00:54 12s feature/playlist-2023-05
feature/playlist-2023-05
September 26, 2023 00:54 12s
* Add watch external file plugin in dev mode only Conflicts #386: Commit dd2beed pushed by PikachuEXE
September 24, 2023 10:18 11s dev/reload-modified-locale
dev/reload-modified-locale
September 24, 2023 10:18 11s
* Ensure updated locales are auto-reloaded in electron renderer dev mode Conflicts #385: Commit e2f4665 pushed by PikachuEXE
September 24, 2023 02:37 14s dev/reload-modified-locale
dev/reload-modified-locale
September 24, 2023 02:37 14s
* Ensure updated locales are auto-reloaded in electron renderer dev mode Conflicts #384: Commit 981f4e9 pushed by PikachuEXE
September 24, 2023 02:21 16s dev/reload-modified-locale
dev/reload-modified-locale
September 24, 2023 02:21 16s
! Fix in sub view, restoring last tab is bugged when visible tabs do … Conflicts #383: Commit b81690a pushed by PikachuEXE
September 23, 2023 13:18 12s fix/sub-restore-tab
fix/sub-restore-tab
September 23, 2023 13:18 12s
! Allow video with local playlist to be played in external player, bu… Conflicts #382: Commit 095fb48 pushed by PikachuEXE
September 19, 2023 06:51 15s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 06:51 15s
* Reflect playlist updates on watch page playlist panel, even for cur… Conflicts #381: Commit be80686 pushed by PikachuEXE
September 19, 2023 02:14 15s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 02:14 15s
! Fix watch page about user playlist detection on new window Conflicts #380: Commit 7863d03 pushed by PikachuEXE
September 19, 2023 01:58 21s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 01:58 21s
! Fix grid item for video in watch page playlist component with user … Conflicts #379: Commit 2fd43b5 pushed by PikachuEXE
September 19, 2023 01:32 14s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 01:32 14s
! Fix grid item for video in history with user playlist to hide exter… Conflicts #378: Commit db6e2bc pushed by PikachuEXE
September 19, 2023 01:20 16s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 01:20 16s
! Fix grid item for playlist to hide external player button for local… Conflicts #377: Commit ca5f045 pushed by PikachuEXE
September 19, 2023 00:52 13s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 00:52 13s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #376: Commit 95e5a17 pushed by PikachuEXE
September 19, 2023 00:44 16s feature/playlist-2023-05
feature/playlist-2023-05
September 19, 2023 00:44 16s
* Use working fork of vue-devtools Conflicts #375: Commit b7ec0a0 pushed by PikachuEXE
September 14, 2023 03:04 15s dev/vue-devtools/pika-fork
dev/vue-devtools/pika-fork
September 14, 2023 03:04 15s
* Keep partial playlist backward compatibility by restoring type in… Conflicts #374: Commit ab5879a pushed by PikachuEXE
September 14, 2023 02:53 14s feature/playlist-2023-05
feature/playlist-2023-05
September 14, 2023 02:53 14s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #373: Commit 80c4489 pushed by PikachuEXE
September 14, 2023 02:51 12s feature/playlist-2023-05
feature/playlist-2023-05
September 14, 2023 02:51 12s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #372: Commit b955b3f pushed by PikachuEXE
September 14, 2023 00:29 11s feature/playlist-2023-05
feature/playlist-2023-05
September 14, 2023 00:29 11s
* Remove unused video property paid Conflicts #371: Commit 6cb55c8 pushed by PikachuEXE
September 13, 2023 01:15 16s fix/import-history/last-viewed-playlist-id
fix/import-history/last-viewed-playlist-id
September 13, 2023 01:15 16s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #370: Commit 934b584 pushed by PikachuEXE
September 13, 2023 00:14 14s feature/playlist-2023-05
feature/playlist-2023-05
September 13, 2023 00:14 14s
! Fix error in online playlist playing Conflicts #369: Commit a0223e1 pushed by PikachuEXE
September 12, 2023 07:48 16s feature/playlist-2023-05
feature/playlist-2023-05
September 12, 2023 07:48 16s
! Fix watch page play next/prev video in local playlist Conflicts #368: Commit 66e3dbe pushed by PikachuEXE
September 12, 2023 07:46 13s feature/playlist-2023-05
feature/playlist-2023-05
September 12, 2023 07:46 13s
! Fix add video to playlist prompt too high when there are too many p… Conflicts #367: Commit d7421c7 pushed by PikachuEXE
September 12, 2023 06:53 15s feature/playlist-2023-05
feature/playlist-2023-05
September 12, 2023 06:53 15s
* Reflect playlist updates on watch page playlist panel Conflicts #366: Commit 125a467 pushed by PikachuEXE
September 12, 2023 03:35 14s feature/playlist-2023-05
feature/playlist-2023-05
September 12, 2023 03:35 14s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #365: Commit d07c532 pushed by PikachuEXE
September 12, 2023 01:30 16s feature/playlist-2023-05
feature/playlist-2023-05
September 12, 2023 01:30 16s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #364: Commit 85eb2af pushed by PikachuEXE
September 11, 2023 07:46 12s feature/playlist-2023-05
feature/playlist-2023-05
September 11, 2023 07:46 12s
ProTip! You can narrow down the results and go further in time using created:<2023-09-11 or the other filters available.