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

Fix the text color and RTL handling Conflicts #633: Commit 64aec23 pushed by kommunarr
August 12, 2024 17:09 14s tst-shka-1
tst-shka-1
August 12, 2024 17:09 14s
Merge branch 'development' into shaka-migration Conflicts #632: Commit 6a94be2 pushed by kommunarr
July 31, 2024 20:14 20s test-shaka-2
test-shaka-2
July 31, 2024 20:14 20s
Fix Invidious API error Conflicts #631: Commit 3ef3d0f pushed by kommunarr
July 29, 2024 23:05 11s test-shaka
test-shaka
July 29, 2024 23:05 11s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #630: Commit abbd349 pushed by kommunarr
July 1, 2024 00:14 13s feat/add-page-bookmarking
feat/add-page-bookmarking
July 1, 2024 00:14 13s
Align banner with ft-card width using identical styling rules Conflicts #629: Commit 914acf3 pushed by kommunarr
June 21, 2024 15:07 13s feat/add-full-width-layout
feat/add-full-width-layout
June 21, 2024 15:07 13s
Evaluate live chat scroll check on scrollend Conflicts #628: Commit 469b914 pushed by kommunarr
June 21, 2024 14:12 12s fix/live-chat-scroll
fix/live-chat-scroll
June 21, 2024 14:12 12s
Fix playlist list view when side nav is open Conflicts #627: Commit 72ca2f8 pushed by kommunarr
June 21, 2024 04:13 14s feat/add-full-width-layout
feat/add-full-width-layout
June 21, 2024 04:13 14s
Adjust list styling to have fixed width for large viewport widths Conflicts #626: Commit 83e79e1 pushed by kommunarr
June 21, 2024 03:46 10s feat/add-full-width-layout
feat/add-full-width-layout
June 21, 2024 03:46 10s
Adjust list styling to have fixed width for large viewport widths Conflicts #625: Commit 6b0d9fb pushed by kommunarr
June 21, 2024 03:42 12s feat/add-full-width-layout
feat/add-full-width-layout
June 21, 2024 03:42 12s
Adjust breakpoint to prevent breakage when side nav is expanded Conflicts #624: Commit 3cc6d81 pushed by kommunarr
June 20, 2024 17:40 14s feat/add-full-width-layout
feat/add-full-width-layout
June 20, 2024 17:40 14s
Add catch-all size limit on ft-card that fixes commment overflow issue Conflicts #623: Commit 5a86911 pushed by kommunarr
June 20, 2024 17:09 11s fix/card-overflow
fix/card-overflow
June 20, 2024 17:09 11s
Switch to 6 columns after 2000px, and set max card width to 2800px Conflicts #622: Commit 74bf210 pushed by kommunarr
June 20, 2024 14:49 14s feat/add-full-width-layout
feat/add-full-width-layout
June 20, 2024 14:49 14s
Fix long title edge cases for playlist grid and list views Conflicts #621: Commit 7d23aac pushed by kommunarr
June 20, 2024 05:02 11s feat/add-full-width-layout
feat/add-full-width-layout
June 20, 2024 05:02 11s
Institute full-width layout for ft-cards Conflicts #620: Commit 7c07d47 pushed by kommunarr
June 20, 2024 03:31 11s feat/add-full-width-layout
feat/add-full-width-layout
June 20, 2024 03:31 11s
Bump version number to v0.20.0 Conflicts #619: Commit 54b49dc pushed by kommunarr
June 19, 2024 12:04 17s master
master
June 19, 2024 12:04 17s
Translated using Weblate (Portuguese) Conflicts #618: Commit c760f40 pushed by kommunarr
June 19, 2024 12:04 12s development
development
June 19, 2024 12:04 12s
Update src/renderer/themes.css Conflicts #617: Commit ef13d34 pushed by kommunarr
June 19, 2024 11:57 11s feat/making-adding-themes-easier
feat/making-adding-themes-easier
June 19, 2024 11:57 11s
Merge branch 'development' into feat/add-page-bookmarking Conflicts #616: Commit 3504424 pushed by kommunarr
June 19, 2024 00:29 10s feat/add-page-bookmarking
feat/add-page-bookmarking
June 19, 2024 00:29 10s
Update theme ordering to reflect their ordering elsewhere in the code… Conflicts #615: Commit 821cdf4 pushed by kommunarr
June 19, 2024 00:08 16s feat/making-adding-themes-easier
feat/making-adding-themes-easier
June 19, 2024 00:08 16s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #614: Commit 84e2d07 pushed by kommunarr
June 18, 2024 23:52 13s feat/making-adding-themes-easier
feat/making-adding-themes-easier
June 18, 2024 23:52 13s
Merge branch 'development' into maint/remove-donation-methods Conflicts #613: Commit aa98df3 pushed by kommunarr
June 18, 2024 22:26 12s maint/remove-donation-methods
maint/remove-donation-methods
June 18, 2024 22:26 12s
Update README.md Conflicts #612: Commit 95a9d3f pushed by kommunarr
June 18, 2024 21:24 13s maint/remove-donation-methods
maint/remove-donation-methods
June 18, 2024 21:24 13s
Remove instances to Monero and Liberapay Conflicts #611: Commit 0a4101f pushed by kommunarr
June 18, 2024 21:14 10s maint/remove-donation-methods
maint/remove-donation-methods
June 18, 2024 21:14 10s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #610: Commit 13ba73e pushed by kommunarr
June 15, 2024 13:43 10s feat/add-page-bookmarking
feat/add-page-bookmarking
June 15, 2024 13:43 10s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #609: Commit 188b4bc pushed by kommunarr
June 15, 2024 13:21 13s feat/making-adding-themes-easier
feat/making-adding-themes-easier
June 15, 2024 13:21 13s