Skip to content

Actions: kommunarr/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
633 workflow runs
633 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update top nav to handle icon button styling Conflicts #583: Commit a4e0718 pushed by kommunarr
June 3, 2024 04:22 10s change/icon-button-mousedown
change/icon-button-mousedown
June 3, 2024 04:22 10s
Test change Conflicts #582: Commit a94a896 pushed by kommunarr
June 3, 2024 01:17 11s feat/nav-history-dropdowns
feat/nav-history-dropdowns
June 3, 2024 01:17 11s
Fix wrong variable for reversal bug Conflicts #581: Commit 4f37130 pushed by kommunarr
June 1, 2024 14:01 14s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
June 1, 2024 14:01 14s
Fix other shuffle issue Conflicts #580: Commit 379e62e pushed by kommunarr
June 1, 2024 13:51 14s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
June 1, 2024 13:51 14s
Fix shuffle prevVideo issue Conflicts #579: Commit 0247aca pushed by kommunarr
May 31, 2024 21:14 15s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 31, 2024 21:14 15s
Focus active menu on mobile close Conflicts #578: Commit 745b222 pushed by kommunarr
May 31, 2024 11:39 12s feat/add-settings-menu
feat/add-settings-menu
May 31, 2024 11:39 12s
Handle first video in playlist being removed Conflicts #577: Commit d00bc83 pushed by kommunarr
May 31, 2024 11:17 11s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 31, 2024 11:17 11s
Handle first video in playlist being removed Conflicts #576: Commit 9d71186 pushed by kommunarr
May 31, 2024 11:15 11s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 31, 2024 11:15 11s
Handle first video in playlist being removed Conflicts #575: Commit cd9d91b pushed by kommunarr
May 31, 2024 11:02 12s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 31, 2024 11:02 12s
Update settings menu link sizing to be dynamic to better accommodate … Conflicts #574: Commit c7479b6 pushed by kommunarr
May 30, 2024 01:48 18s feat/add-settings-menu
feat/add-settings-menu
May 30, 2024 01:48 18s
Change Playlist.js logic to cache user playlists, and pass the sorted… Conflicts #573: Commit b91d925 pushed by kommunarr
May 30, 2024 00:59 14s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
May 30, 2024 00:59 14s
Fix issue where first video is skipped when current video after remov… Conflicts #572: Commit 7e398a8 pushed by kommunarr
May 30, 2024 00:36 19s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 30, 2024 00:36 19s
Implement suggested changes Conflicts #571: Commit 5978fb5 pushed by kommunarr
May 27, 2024 20:41 13s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 27, 2024 20:41 13s
Update with suggested changes to make null maxlength the default Conflicts #570: Commit cf9381b pushed by kommunarr
May 27, 2024 17:43 9s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 27, 2024 17:43 9s
Update src/renderer/views/Playlist/Playlist.scss Conflicts #569: Commit d2f7b4d pushed by kommunarr
May 27, 2024 02:59 11s fix/z-index-playlist
fix/z-index-playlist
May 27, 2024 02:59 11s
Update src/renderer/views/Playlist/Playlist.scss Conflicts #568: Commit a8c5e37 pushed by kommunarr
May 27, 2024 02:02 13s fix/z-index-playlist
fix/z-index-playlist
May 27, 2024 02:02 13s
Fix z-index issue Conflicts #567: Commit fff3d97 pushed by kommunarr
May 26, 2024 22:33 11s fix/z-index-playlist
fix/z-index-playlist
May 26, 2024 22:33 11s
Make class-specific constants declared in file Conflicts #566: Commit a07bafc pushed by kommunarr
May 25, 2024 21:51 9s feat/add-settings-menu
feat/add-settings-menu
May 25, 2024 21:51 9s
Update as per review comments Conflicts #565: Commit de6b2fe pushed by kommunarr
May 25, 2024 21:44 13s feat/add-settings-menu
feat/add-settings-menu
May 25, 2024 21:44 13s
Have scrollbar increase in size on hover Conflicts #564: Commit 400f887 pushed by kommunarr
May 25, 2024 14:15 10s feat/change-scrollbar-size
feat/change-scrollbar-size
May 25, 2024 14:15 10s
Use auto scrollbar size for all except the side nav Conflicts #563: Commit efa4984 pushed by kommunarr
May 25, 2024 13:33 11s feat/change-scrollbar-size
feat/change-scrollbar-size
May 25, 2024 13:33 11s
Fix channel sort values to show the values they are Conflicts #562: Commit 24152c7 pushed by kommunarr
May 23, 2024 22:18 14s fix/channel-dropdown-values
fix/channel-dropdown-values
May 23, 2024 22:18 14s
Implement suggested changes Conflicts #561: Commit 0f71254 pushed by kommunarr
May 23, 2024 12:03 11s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 23, 2024 12:03 11s
Update proxy port and playlist description maxlength Conflicts #560: Commit 6c7bcb9 pushed by kommunarr
May 23, 2024 04:28 14s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 23, 2024 04:28 14s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #559: Commit d4124a1 pushed by kommunarr
May 22, 2024 22:12 11s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
May 22, 2024 22:12 11s