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

Add explicit text-align: start in places to ensure rtl version is cor… Conflicts #33: Commit e855b48 pushed by kommunarr
August 28, 2023 23:39 43s add-rtl-support
add-rtl-support
August 28, 2023 23:39 43s
Disable primary & secondary color theme controls when hot pink theme … Conflicts #32: Commit a93a3e7 pushed by kommunarr
August 28, 2023 23:28 14s pink-themes
pink-themes
August 28, 2023 23:28 14s
Remove extraneous additional dash Conflicts #31: Commit cfa9573 pushed by kommunarr
August 28, 2023 13:32 11s fix-select-issue
fix-select-issue
August 28, 2023 13:32 11s
Remove user-select lines (already in another PR) & one extraneous line Conflicts #30: Commit 26d9292 pushed by kommunarr
August 28, 2023 02:29 11s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 28, 2023 02:29 11s
Add user-select:none to one more area Conflicts #29: Commit 2c1c431 pushed by kommunarr
August 27, 2023 23:42 12s fix-select-issue
fix-select-issue
August 27, 2023 23:42 12s
Implement logic setting/disabling accessibility override colors when … Conflicts #28: Commit 2a651c2 pushed by kommunarr
August 27, 2023 23:31 10s color-contrast-filter
color-contrast-filter
August 27, 2023 23:31 10s
Fix incorrect variable name Conflicts #27: Commit 0018ddf pushed by kommunarr
August 27, 2023 15:48 11s pink-themes
pink-themes
August 27, 2023 15:48 11s
Hide channel names on the Channel page Conflicts #26: Commit 68001c8 pushed by kommunarr
August 27, 2023 07:39 12s hide-names-on-channel-page
hide-names-on-channel-page
August 27, 2023 07:39 12s
Ensure video list buttons always show on devices without hover (e.g.,… Conflicts #25: Commit 2186613 pushed by kommunarr
August 27, 2023 05:15 13s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 27, 2023 05:15 13s
Ensure video list buttons always show on devices without hover (e.g.,… Conflicts #24: Commit ec538dd pushed by kommunarr
August 27, 2023 05:04 12s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 27, 2023 05:04 12s
Ensure video list buttons always show on devices without hover (e.g.,… Conflicts #23: Commit 83bd9e8 pushed by kommunarr
August 27, 2023 04:52 12s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 27, 2023 04:52 12s
Ensure video list buttons always show on devices without hover (e.g.,… Conflicts #22: Commit c83d650 pushed by kommunarr
August 27, 2023 04:24 11s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 27, 2023 04:24 11s
Implement video list settings button only appearing on hover/focus Conflicts #21: Commit dfaf498 pushed by kommunarr
August 27, 2023 03:01 14s show-video-list-buttons-on-hover-or-focus
show-video-list-buttons-on-hover-or-focus
August 27, 2023 03:01 14s
Make certain controls non-selectable / non-draggable (#3947) Conflicts #20: Commit 665da2c pushed by kommunarr
August 27, 2023 01:47 11s development
development
August 27, 2023 01:47 11s
Remove selection from ft-flex-box, ft-input placeholders, and profile… Conflicts #19: Commit 4df56fe pushed by kommunarr
August 26, 2023 05:34 11s make-certain-text-unselectable
make-certain-text-unselectable
August 26, 2023 05:34 11s
Switch all instances of user-select to be only user-select and -webki… Conflicts #18: Commit 6e27a14 pushed by kommunarr
August 26, 2023 04:06 13s make-settings-headings-unselectable
make-settings-headings-unselectable
August 26, 2023 04:06 13s
Implement rounded thumbnail image styling Conflicts #17: Commit 09a1526 pushed by kommunarr
August 26, 2023 03:55 13s rounded-thumbnails
rounded-thumbnails
August 26, 2023 03:55 13s
Fix HTML styling (e.g., hashtag links) showing up as raw HTML in desc… Conflicts #16: Commit c3cfa7d pushed by kommunarr
August 26, 2023 03:55 11s fix-raw-html
fix-raw-html
August 26, 2023 03:55 11s
Fix favoritesIcon taking up max height Conflicts #15: Commit 5b1d9b2 pushed by kommunarr
August 26, 2023 03:54 10s fix-favorites-icon
fix-favorites-icon
August 26, 2023 03:54 10s
Hide channel names on the Channel page Conflicts #14: Commit a6cc66d pushed by kommunarr
August 25, 2023 07:03 12s usability-improvements
usability-improvements
August 25, 2023 07:03 12s
Hide channel names on the Channel page Conflicts #13: Commit 9be8dd1 pushed by kommunarr
August 25, 2023 06:46 11s usability-improvements
usability-improvements
August 25, 2023 06:46 11s
Add side-nav hover-text and active-text styling to ft-icon-button Conflicts #12: Commit 8093899 pushed by kommunarr
August 24, 2023 07:55 11s pink-themes
pink-themes
August 24, 2023 07:55 11s
Add side-nav hover-text and active-text styling to ft-icon-button Conflicts #11: Commit 0e8301e pushed by kommunarr
August 24, 2023 07:39 11s pink-themes
pink-themes
August 24, 2023 07:39 11s
Update Hot Pink theme accent-color-active Conflicts #10: Commit 9201646 pushed by kommunarr
August 24, 2023 06:31 10s pink-themes
pink-themes
August 24, 2023 06:31 10s
Update Hot Pink theme accent-color-active Conflicts #9: Commit 0667eab pushed by kommunarr
August 24, 2023 06:24 10s pink-themes
pink-themes
August 24, 2023 06:24 10s
ProTip! You can narrow down the results and go further in time using created:<2023-08-24 or the other filters available.