Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
393 workflow runs
393 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

! Fix URL copied via right click menu Conflicts #538: Commit d935574 pushed by PikachuEXE
February 21, 2024 00:11 16s fix/right-click-copy-url
fix/right-click-copy-url
February 21, 2024 00:11 16s
! Fix URL copied via right click menu Conflicts #537: Commit b4ed11e pushed by PikachuEXE
February 19, 2024 08:30 16s fix/right-click-copy-url
fix/right-click-copy-url
February 19, 2024 08:30 16s
Merge branch 'development' into feature/playlist-search-videos-in-one… Conflicts #536: Commit 383d9c2 pushed by PikachuEXE
February 15, 2024 23:16 13s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
February 15, 2024 23:16 13s
! Fix comment channel link display w/ local API Conflicts #535: Commit 408687d pushed by PikachuEXE
February 8, 2024 07:42 12s fix/channel-link-parsing
fix/channel-link-parsing
February 8, 2024 07:42 12s
* Implement auto load next page for single playlist page Conflicts #534: Commit 26c90a0 pushed by PikachuEXE
February 3, 2024 03:07 11s feature/auto-load-next-page
feature/auto-load-next-page
February 3, 2024 03:07 11s
* Show message when search returns no result Conflicts #533: Commit b60fdff pushed by PikachuEXE
February 3, 2024 02:58 14s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
February 3, 2024 02:58 14s
Merge branch 'development' into custom-builds/current Conflicts #532: Commit e372f51 pushed by PikachuEXE
February 2, 2024 00:51 13s custom-builds/current
custom-builds/current
February 2, 2024 00:51 13s
Merge branch 'feature/playlist-search-videos-in-one-user-playlist-2' … Conflicts #531: Commit 5909acd pushed by PikachuEXE
February 1, 2024 12:43 10s custom-builds/current
custom-builds/current
February 1, 2024 12:43 10s
! Fix load more button appears when searching & visible items under p… Conflicts #530: Commit 5271a80 pushed by PikachuEXE
February 1, 2024 12:42 13s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
February 1, 2024 12:42 13s
Translated using Weblate (German) Conflicts #529: Commit 5a316f1 pushed by PikachuEXE
January 31, 2024 08:43 14s development
development
January 31, 2024 08:43 14s
Merge branch 'fix/playlist/user-playlist-from-history' into custom-bu… Conflicts #528: Commit 2331abf pushed by PikachuEXE
January 31, 2024 08:27 13s custom-builds/current
custom-builds/current
January 31, 2024 08:27 13s
! Fix playlist type not passed when playing next/prev item in a user … Conflicts #527: Commit 168f11d pushed by PikachuEXE
January 31, 2024 08:20 15s fix/playlist/user-playlist-from-history
fix/playlist/user-playlist-from-history
January 31, 2024 08:20 15s
! Fix load more button appears when searching & visible items under p… Conflicts #526: Commit 769626f pushed by PikachuEXE
January 31, 2024 08:15 13s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
January 31, 2024 08:15 13s
* Update single playlist view for user playlists to add search video … Conflicts #525: Commit 1bfe0ad pushed by PikachuEXE
January 31, 2024 07:45 10s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
January 31, 2024 07:45 10s
* Update single playlist view for user playlists to add search video … Conflicts #524: Commit 0c8ca8f pushed by PikachuEXE
January 31, 2024 07:41 10s feature/playlist-search-videos-in-one-user-playlist-2
feature/playlist-search-videos-in-one-user-playlist-2
January 31, 2024 07:41 10s
Merge branch 'user-channel-page-header' into custom-builds/current Conflicts #523: Commit 9eb54dd pushed by PikachuEXE
January 31, 2024 00:48 16s custom-builds/current
custom-builds/current
January 31, 2024 00:48 16s
* Don't remember pagination limit, which reintroduce performance issue Conflicts #522: Commit 88a4c1f pushed by PikachuEXE
January 23, 2024 06:35 13s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 06:35 13s
! Fix moving video position animation playing twice Conflicts #521: Commit f1d700d pushed by PikachuEXE
January 23, 2024 02:50 13s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 02:50 13s
! Fix copying user playlist when not all videos loaded Conflicts #520: Commit 88ccbcf pushed by PikachuEXE
January 23, 2024 02:21 11s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 02:21 11s
! Fix video position update when not all videos loaded Conflicts #519: Commit ef89b48 pushed by PikachuEXE
January 23, 2024 02:10 10s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 02:10 10s
* Make remembered limit per playlist Conflicts #518: Commit f7d8f00 pushed by PikachuEXE
January 23, 2024 01:54 12s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 01:54 12s
* Update single playlst view for user playlist to have pagination Conflicts #517: Commit 54160f6 pushed by PikachuEXE
January 23, 2024 00:56 14s feature/playlist/pagination
feature/playlist/pagination
January 23, 2024 00:56 14s
no message Conflicts #516: Commit adfc9f7 pushed by PikachuEXE
January 18, 2024 07:24 13s feature/auto-load-next-page
feature/auto-load-next-page
January 18, 2024 07:24 13s
$ Use new component to dedup auto load code Conflicts #515: Commit a276986 pushed by PikachuEXE
January 18, 2024 01:19 14s feature/auto-load-next-page
feature/auto-load-next-page
January 18, 2024 01:19 14s
* Make comment section auto load next pages too Conflicts #514: Commit f1ced04 pushed by PikachuEXE
January 17, 2024 02:40 11s feature/auto-load-next-page
feature/auto-load-next-page
January 17, 2024 02:40 11s