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 disabled bookmark icon styling Conflicts #533: Commit 5026d80 pushed by kommunarr
May 15, 2024 05:47 11s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 15, 2024 05:47 11s
Implement mobile view for Settings Menu Conflicts #532: Commit 9e9a07a pushed by kommunarr
May 15, 2024 05:08 12s feat/add-settings-menu
feat/add-settings-menu
May 15, 2024 05:08 12s
Update mobile changelog styling Conflicts #531: Commit 61ba63a pushed by kommunarr
May 14, 2024 22:43 13s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 14, 2024 22:43 13s
Update logic to use empty or latest played playlist as fallback target Conflicts #530: Commit 93ed9ab pushed by kommunarr
May 14, 2024 13:13 14s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 14, 2024 13:13 14s
Update width to 50em Conflicts #529: Commit 1b00dd2 pushed by kommunarr
May 14, 2024 01:35 12s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 14, 2024 01:35 12s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #528: Commit 71355c8 pushed by kommunarr
May 14, 2024 01:24 13s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 14, 2024 01:24 13s
Apply suggestions from code review Conflicts #527: Commit 27ab7e3 pushed by kommunarr
May 13, 2024 23:10 11s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 13, 2024 23:10 11s
Update src/renderer/helpers/playlists.js Conflicts #526: Commit 1cf9f7e pushed by kommunarr
May 13, 2024 21:25 14s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
May 13, 2024 21:25 14s
Update src/renderer/helpers/playlists.js Conflicts #525: Commit 66d67ff pushed by kommunarr
May 13, 2024 21:15 11s feat/add-playlist-sort-order-2
feat/add-playlist-sort-order-2
May 13, 2024 21:15 11s
Update spacing to be even Conflicts #524: Commit 88fd91c pushed by kommunarr
May 13, 2024 20:44 13s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 13, 2024 20:44 13s
Add 'readable width' theme for making release notes more easily readable Conflicts #523: Commit 9928d93 pushed by kommunarr
May 13, 2024 20:25 14s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 13, 2024 20:25 14s
Add 'readable width' theme for making release notes more easily readable Conflicts #522: Commit 0ade3e2 pushed by kommunarr
May 13, 2024 20:16 12s feat/constrain-changelog-modal-width
feat/constrain-changelog-modal-width
May 13, 2024 20:16 12s
Revert to 29.3.3 Conflicts #521: Commit 887102b pushed by kommunarr
May 13, 2024 18:51 12s feat/revert-electron-30
feat/revert-electron-30
May 13, 2024 18:51 12s
Revert "Bump electron from 29.3.0 to 30.0.1 (#4995)" Conflicts #520: Commit af215cf pushed by kommunarr
May 11, 2024 13:15 10s feat/revert-electron-30
feat/revert-electron-30
May 11, 2024 13:15 10s
Revert "Bump electron from 30.0.1 to 30.0.2 (#5078)" Conflicts #519: Commit 00f5288 pushed by kommunarr
May 11, 2024 13:02 10s feat/revert-electron-30
feat/revert-electron-30
May 11, 2024 13:02 10s
Update translation text Conflicts #518: Commit ba0fb67 pushed by PikachuEXE
May 8, 2024 22:47 12s feat/always-have-quick-bookmark
feat/always-have-quick-bookmark
May 8, 2024 22:47 12s
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe… Conflicts #517: Commit 50dc04b pushed by kommunarr
May 8, 2024 21:23 11s feat/add-page-bookmarking
feat/add-page-bookmarking
May 8, 2024 21:23 11s
Add missing Invidious / YT logo theme overrides Conflicts #516: Commit eb160bb pushed by kommunarr
May 6, 2024 11:42 13s feat/making-adding-themes-easier
feat/making-adding-themes-easier
May 6, 2024 11:42 13s
Add missing Invidious / YT logo theme overrides Conflicts #515: Commit c4e0f30 pushed by kommunarr
May 6, 2024 00:38 14s feat/making-adding-themes-easier
feat/making-adding-themes-easier
May 6, 2024 00:38 14s
Add missing Invidious / YT logo theme overrides Conflicts #514: Commit 01ef0de pushed by kommunarr
May 6, 2024 00:33 11s feat/making-adding-themes-easier
feat/making-adding-themes-easier
May 6, 2024 00:33 11s
Add missing Invidious / YT logo theme overrides Conflicts #513: Commit 57e8467 pushed by kommunarr
May 6, 2024 00:32 12s feat/making-adding-themes-easier
feat/making-adding-themes-easier
May 6, 2024 00:32 12s
Centralize styling in themes.css, add code commenting, and simplify d… Conflicts #512: Commit 682a72c pushed by kommunarr
May 6, 2024 00:29 11s feat/making-adding-themes-easier
feat/making-adding-themes-easier
May 6, 2024 00:29 11s
Update to adjust height properly when playlist only has one item, not… Conflicts #511: Commit bc70bd0 pushed by kommunarr
May 4, 2024 15:42 12s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 4, 2024 15:42 12s
Merge branch 'development' into feat/user-playlists-as-grid Conflicts #510: Commit c348a1a pushed by kommunarr
May 4, 2024 03:06 12s feat/user-playlists-as-grid
feat/user-playlists-as-grid
May 4, 2024 03:06 12s
Merge branch 'development' into feat/add-settings-menu Conflicts #509: Commit c59b9a8 pushed by kommunarr
May 4, 2024 03:05 10s feat/add-settings-menu
feat/add-settings-menu
May 4, 2024 03:05 10s