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

Merge branch 'development' into feat/add-settings-menu Conflicts #608: Commit cf784d7 pushed by kommunarr
June 12, 2024 17:16 13s feat/add-settings-menu
feat/add-settings-menu
June 12, 2024 17:16 13s
Update playlist route icons Conflicts #607: Commit b162507 pushed by kommunarr
June 12, 2024 02:30 12s feat/add-page-bookmarking
feat/add-page-bookmarking
June 12, 2024 02:30 12s
Add message when there are other page bookmarks with the same name Conflicts #606: Commit 094b2c2 pushed by kommunarr
June 11, 2024 23:03 15s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 23:03 15s
Constrain visible ft-input results list length to 15 Conflicts #605: Commit e5b5b43 pushed by kommunarr
June 11, 2024 21:43 14s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 21:43 14s
Constrain visible ft-input results list length to 15 Conflicts #604: Commit 2dc496e pushed by kommunarr
June 11, 2024 21:16 8m 37s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 21:16 8m 37s
Delete page bookmarks to user playlists when those user playlists are… Conflicts #603: Commit 039fce1 pushed by kommunarr
June 11, 2024 18:43 24s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 18:43 24s
Update to show the proper page bookmark name upon deletion Conflicts #602: Commit 4736723 pushed by kommunarr
June 11, 2024 15:10 19s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 15:10 19s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #601: Commit d6429d5 pushed by kommunarr
June 11, 2024 12:27 12s feat/add-page-bookmarking
feat/add-page-bookmarking
June 11, 2024 12:27 12s
Update menu font size for mobile devices Conflicts #600: Commit 7108cea pushed by kommunarr
June 7, 2024 12:28 13s feat/add-settings-menu
feat/add-settings-menu
June 7, 2024 12:28 13s
Update menu font size for mobile devices Conflicts #599: Commit e6f4d7d pushed by kommunarr
June 7, 2024 12:24 13s feat/add-settings-menu
feat/add-settings-menu
June 7, 2024 12:24 13s
Update menu font size for mobile devices Conflicts #598: Commit f5b2f36 pushed by kommunarr
June 7, 2024 12:22 12s feat/add-settings-menu
feat/add-settings-menu
June 7, 2024 12:22 12s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #597: Commit 093c3e6 pushed by kommunarr
June 6, 2024 22:31 12s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
June 6, 2024 22:31 12s
Implement suggested optimization Conflicts #596: Commit 257681e pushed by kommunarr
June 4, 2024 22:05 11s feat/play-next-or-prev-from-deleted
feat/play-next-or-prev-from-deleted
June 4, 2024 22:05 11s
Fix page bookmark removal function call to pass the route, not the fu… Conflicts #595: Commit ede347a pushed by kommunarr
June 4, 2024 05:32 12s feat/add-page-bookmarking
feat/add-page-bookmarking
June 4, 2024 05:32 12s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #594: Commit d9d8c9c pushed by kommunarr
June 4, 2024 04:59 12s feat/add-page-bookmarking
feat/add-page-bookmarking
June 4, 2024 04:59 12s
Replace shortTitle with title, & replace EN-US labels with shorter forms Conflicts #593: Commit 08a22be pushed by kommunarr
June 4, 2024 04:30 11s feat/add-settings-menu
feat/add-settings-menu
June 4, 2024 04:30 11s
Fix top bar with main color navigation arrow icon bug Conflicts #592: Commit fe44226 pushed by kommunarr
June 4, 2024 03:44 10s feat/nav-history
feat/nav-history
June 4, 2024 03:44 10s
Update checkmark styling to have uniform flex-start alignment Conflicts #591: Commit 699a87e pushed by kommunarr
June 4, 2024 03:24 11s feat/nav-history
feat/nav-history
June 4, 2024 03:24 11s
Add checkmark icon to active history entry Conflicts #590: Commit 45256bb pushed by kommunarr
June 4, 2024 03:13 10s feat/nav-history
feat/nav-history
June 4, 2024 03:13 10s
Update nav icon titles to reflect new behavior, & make their title te… Conflicts #589: Commit 22a1365 pushed by kommunarr
June 4, 2024 02:51 12s feat/nav-history
feat/nav-history
June 4, 2024 02:51 12s
Update nav icon titles to reflect new behavior, & make their title te… Conflicts #588: Commit a81cadf pushed by kommunarr
June 4, 2024 02:36 12s feat/nav-history
feat/nav-history
June 4, 2024 02:36 12s
Improve readability & fix top-nav-with-main-color icon button styling Conflicts #587: Commit 0cbb649 pushed by kommunarr
June 4, 2024 01:51 17s feat/nav-history
feat/nav-history
June 4, 2024 01:51 17s
Solidify route.meta.title labelling & specify future steps Conflicts #586: Commit 112bd27 pushed by kommunarr
June 4, 2024 01:00 11s feat/nav-history
feat/nav-history
June 4, 2024 01:00 11s
Solidify route.meta.title labelling & specify future steps Conflicts #585: Commit 2caf870 pushed by kommunarr
June 4, 2024 00:50 11s feat/nav-history
feat/nav-history
June 4, 2024 00:50 11s
Solidify route.meta.title labelling & specify future steps Conflicts #584: Commit 2caf870 pushed by kommunarr
June 4, 2024 00:50 12s change/icon-button-mousedown
change/icon-button-mousedown
June 4, 2024 00:50 12s