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

Remove vestigial code Conflicts #558: Commit afd4784 pushed by kommunarr
May 22, 2024 19:26 10s fix/icon-rtl-checkmark
fix/icon-rtl-checkmark
May 22, 2024 19:26 10s
Remove maxlength where it constrains valid inputs Conflicts #557: Commit 09e4ce0 pushed by kommunarr
May 22, 2024 19:20 13s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 22, 2024 19:20 13s
Have currently deleted video entry become the prior entry in the play… Conflicts #556: Commit d63bec6 pushed by kommunarr
May 22, 2024 19:08 12s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
May 22, 2024 19:08 12s
Fix quick bookmark color disappearing on hover Conflicts #555: Commit c69cc8f pushed by kommunarr
May 22, 2024 16:43 11s fix/icon-rtl-checkmark
fix/icon-rtl-checkmark
May 22, 2024 16:43 11s
Set a max length of 100 for most inputs Conflicts #554: Commit c199048 pushed by kommunarr
May 22, 2024 14:08 12s feat/limit-playlist-title-size
feat/limit-playlist-title-size
May 22, 2024 14:08 12s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #553: Commit dcdd170 pushed by kommunarr
May 22, 2024 13:48 15s feat/add-settings-menu
feat/add-settings-menu
May 22, 2024 13:48 15s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #552: Commit 816ccce pushed by kommunarr
May 22, 2024 13:44 13s feat/add-playlist-name-to-title
feat/add-playlist-name-to-title
May 22, 2024 13:44 13s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #551: Commit 33399a1 pushed by kommunarr
May 22, 2024 13:33 11s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
May 22, 2024 13:33 11s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #550: Commit c075058 pushed by kommunarr
May 22, 2024 13:29 12s feat/add-page-bookmarking
feat/add-page-bookmarking
May 22, 2024 13:29 12s
Update playlist name with title Conflicts #549: Commit 4154b64 pushed by kommunarr
May 22, 2024 03:45 9s feat/add-playlist-name-to-title
feat/add-playlist-name-to-title
May 22, 2024 03:45 9s
Update playlist name with title Conflicts #548: Commit 2903cc3 pushed by kommunarr
May 22, 2024 03:42 15s feat/add-playlist-name-to-title
feat/add-playlist-name-to-title
May 22, 2024 03:42 15s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #547: Commit 6faf21b pushed by kommunarr
May 21, 2024 12:21 18m 54s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 21, 2024 12:21 18m 54s
Make user playlist grid top section sticky, not fixed Conflicts #546: Commit 63172c6 pushed by kommunarr
May 20, 2024 20:43 12s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 20, 2024 20:43 12s
Make user playlist grid top section sticky, not fixed Conflicts #545: Commit c0e2a17 pushed by kommunarr
May 20, 2024 20:34 14s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 20, 2024 20:34 14s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #544: Commit 5597720 pushed by kommunarr
May 20, 2024 14:24 13s feat/add-page-bookmarking
feat/add-page-bookmarking
May 20, 2024 14:24 13s
Bump electron from 30.0.3 to 30.0.6 Conflicts #543: Commit d1290d2 pushed by kommunarr
May 20, 2024 14:02 13s dependabot/npm_and_yarn/electron-30.0.6
dependabot/npm_and_yarn/electron-30.0.6
May 20, 2024 14:02 13s
Update font sizes and breakpoints to work for all supported devices &… Conflicts #542: Commit 31112da pushed by kommunarr
May 20, 2024 13:47 19s feat/add-settings-menu
feat/add-settings-menu
May 20, 2024 13:47 19s
Fix color of Sponsor Block category icons Conflicts #541: Commit 5527da4 pushed by kommunarr
May 20, 2024 00:51 11s fix/sponsor-colors
fix/sponsor-colors
May 20, 2024 00:51 11s
Add height threshold for forcing list view on playlist route Conflicts #540: Commit af1af9d pushed by kommunarr
May 19, 2024 19:38 11s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 19, 2024 19:38 11s
Replace rounded corners and move section titles to the interior Conflicts #539: Commit 1408a44 pushed by kommunarr
May 17, 2024 23:21 11s feat/add-settings-menu
feat/add-settings-menu
May 17, 2024 23:21 11s
Move is-side-nav-open and fixed-top-bar mixins to new partial file Conflicts #538: Commit ecc2866 pushed by kommunarr
May 17, 2024 22:00 13s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 17, 2024 22:00 13s
Remove outdated piece of code Conflicts #537: Commit a81a9f2 pushed by kommunarr
May 16, 2024 01:36 13s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 16, 2024 01:36 13s
Update casing for label Conflicts #536: Commit 93b10ab pushed by kommunarr
May 15, 2024 15:38 12s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 15, 2024 15:38 12s
Update label to be more clear, and add periods to convey more serious… Conflicts #535: Commit b3166ce pushed by kommunarr
May 15, 2024 13:13 12s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 15, 2024 13:13 12s
Update to use @disabled-click event instead of showToast-specific beh… Conflicts #534: Commit a5ccd53 pushed by kommunarr
May 15, 2024 06:31 11s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 15, 2024 06:31 11s