Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
364 workflow runs
364 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

* Show one action per shortcut action with N shortcuts Conflicts #752: Commit aa69384 pushed by PikachuEXE
January 2, 2025 22:47 10s feature/mac-only-bf-shortcuts
feature/mac-only-bf-shortcuts
January 2, 2025 22:47 10s
Merge branch 'fix/description' into custom-builds/tmp Conflicts #751: Commit 449a4f4 pushed by PikachuEXE
December 30, 2024 09:32 12s custom-builds/current
custom-builds/current
December 30, 2024 09:32 12s
* Only attach event listener to timestamp catcher componenet from des… Conflicts #750: Commit b35f5f2 pushed by PikachuEXE
December 30, 2024 01:46 13s fix/description
fix/description
December 30, 2024 01:46 13s
$ Remove unnecessary template tag Conflicts #749: Commit 04c54ab pushed by PikachuEXE
December 29, 2024 11:04 11s fix/description
fix/description
December 29, 2024 11:04 11s
* Allow shortcut label separator to be translated Conflicts #748: Commit 98d8e39 pushed by PikachuEXE
December 29, 2024 00:52 15s feature/mac-only-bf-shortcuts
feature/mac-only-bf-shortcuts
December 29, 2024 00:52 15s
* Update less button to be after description stuff when tabbing Conflicts #747: Commit bf07ad5 pushed by PikachuEXE
December 28, 2024 02:40 9s fix/description
fix/description
December 28, 2024 02:40 9s
* Update description links to not be tabbed into when description box… Conflicts #746: Commit 67c14f8 pushed by PikachuEXE
December 28, 2024 02:38 10s fix/description
fix/description
December 28, 2024 02:38 10s
* Make Cmd left/right go back/forward Conflicts #745: Commit aeffacb pushed by PikachuEXE
December 28, 2024 01:39 11s feature/mac-only-bf-shortcuts
feature/mac-only-bf-shortcuts
December 28, 2024 01:39 11s
! Fix a few issues with collapsable video description Conflicts #744: Commit d8c7562 pushed by PikachuEXE
December 27, 2024 11:20 10s fix/description
fix/description
December 27, 2024 11:20 10s
Merge branch 'local-api-potokens' into custom-builds/current Conflicts #743: Commit 8f0305b pushed by PikachuEXE
December 23, 2024 00:18 11s custom-builds/current
custom-builds/current
December 23, 2024 00:18 11s
Merge branch 'feature/play-next-by-default-w-toggle' into custom-buil… Conflicts #742: Commit a4393ca pushed by PikachuEXE
December 21, 2024 02:58 13s custom-builds/current
custom-builds/current
December 21, 2024 02:58 13s
$ Name props/emits better Conflicts #741: Commit 1c90248 pushed by PikachuEXE
December 21, 2024 02:57 12s feature/play-next-by-default
feature/play-next-by-default
December 21, 2024 02:57 12s
* Ensure autoplayPlaylists on watch page is a local state (even thoug… Conflicts #740: Commit 0620083 pushed by PikachuEXE
December 20, 2024 10:22 12s feature/play-next-by-default
feature/play-next-by-default
December 20, 2024 10:22 12s
* Update play next recommended video setting to be "by default" Conflicts #739: Commit 6202b60 pushed by PikachuEXE
December 17, 2024 02:23 10s feature/play-next-by-default
feature/play-next-by-default
December 17, 2024 02:23 10s
Merge branch 'development' into custom-builds/tmp Conflicts #738: Commit 5ee3bf6 pushed by PikachuEXE
December 10, 2024 01:27 11s custom-builds/current
custom-builds/current
December 10, 2024 01:27 11s
Merge branch 'fix/user-playlist-button-visible' into custom-builds/tmp Conflicts #737: Commit e013a43 pushed by PikachuEXE
December 4, 2024 01:38 14s custom-builds/current
custom-builds/current
December 4, 2024 01:38 14s
! Fix export playlist button visible in edit mode Conflicts #736: Commit 68efc65 pushed by PikachuEXE
December 4, 2024 01:27 13s fix/user-playlist-button-visible
fix/user-playlist-button-visible
December 4, 2024 01:27 13s
* Put event listener back to mounted Conflicts #735: Commit ad83ebf pushed by PikachuEXE
November 29, 2024 12:45 14s feature/history/remember-search-query
feature/history/remember-search-query
November 29, 2024 12:45 14s
$ Change code style Conflicts #734: Commit 82c92d3 pushed by PikachuEXE
November 28, 2024 00:28 14s feature/history/remember-search-query
feature/history/remember-search-query
November 28, 2024 00:28 14s
* Update build workflow to add back osx-arm64 Conflicts #733: Commit 81027b2 pushed by PikachuEXE
November 25, 2024 08:07 14s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 08:07 14s
* Update build workflow to add back osx-arm64 Conflicts #732: Commit fe7ca72 pushed by PikachuEXE
November 25, 2024 07:50 11s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 07:50 11s
* Update build workflow to add back osx-arm64 Conflicts #731: Commit ed8846d pushed by PikachuEXE
November 25, 2024 07:49 11s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 07:49 11s
- Remove useless file after merging dev Conflicts #730: Commit 6041e3a pushed by PikachuEXE
November 24, 2024 01:02 9s feature/history/remember-search-query
feature/history/remember-search-query
November 24, 2024 01:02 9s
Merge branch 'development' into feature/history/remember-search-query Conflicts #729: Commit a5f5a66 pushed by PikachuEXE
November 24, 2024 01:01 13s feature/history/remember-search-query
feature/history/remember-search-query
November 24, 2024 01:01 13s
* Update build workflow to add back osx-arm64 Conflicts #728: Commit 4e2639d pushed by PikachuEXE
November 13, 2024 01:08 14s build/add-mac-arm64
build/add-mac-arm64
November 13, 2024 01:08 14s