Skip to content

Actions: kommunarr/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
689 workflow runs
689 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Correct use of aria-selected in FT Conflicts #184: Commit fffecfe pushed by kommunarr
October 27, 2023 13:17 16s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 13:17 16s
Correct use of aria-selected in FT Conflicts #183: Commit aa4795e pushed by kommunarr
October 27, 2023 13:14 16s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 13:14 16s
Correct use of aria-selected in FT Conflicts #182: Commit f381640 pushed by kommunarr
October 27, 2023 12:59 29s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 12:59 29s
Correct use of aria-selected in FT Conflicts #181: Commit b8f0c2c pushed by kommunarr
October 27, 2023 06:10 12s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 06:10 12s
Correct use of aria-selected in FT Conflicts #180: Commit 920cbbe pushed by kommunarr
October 27, 2023 05:35 15s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 05:35 15s
Implements remaining styling and logic Conflicts #179: Commit 002ffde pushed by kommunarr
October 27, 2023 05:11 11s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 05:11 11s
Implements remaining styling and logic Conflicts #178: Commit ac6a226 pushed by kommunarr
October 27, 2023 04:33 16s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 04:33 16s
Implements remaining styling and logic Conflicts #177: Commit a7f82fd pushed by kommunarr
October 27, 2023 04:18 19s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 04:18 19s
Implements remaining styling and logic Conflicts #176: Commit 99edf5b pushed by kommunarr
October 27, 2023 03:59 14s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 03:59 14s
Implement dropdown element and styling Conflicts #175: Commit 069d90b pushed by kommunarr
October 27, 2023 01:08 11s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 01:08 11s
Merge branch 'development' into feat/add-list-display-settings Conflicts #174: Commit 3d14d28 pushed by kommunarr
October 27, 2023 00:23 15s feat/add-list-display-settings
feat/add-list-display-settings
October 27, 2023 00:23 15s
Merge branch 'development' into feat/add-select-mode Conflicts #173: Commit c0f3e48 pushed by kommunarr
October 27, 2023 00:22 16s feat/add-select-mode
feat/add-select-mode
October 27, 2023 00:22 16s
Implement dropdown element and styling Conflicts #172: Commit 612c432 pushed by kommunarr
October 27, 2023 00:08 14s feat/new-way-to-subscribe
feat/new-way-to-subscribe
October 27, 2023 00:08 14s
Prevent non-mobile-specific theme settings from showing on mobile; up… Conflicts #171: Commit dc28f86 pushed by kommunarr
October 26, 2023 19:47 15s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 19:47 15s
Prevent non-mobile-specific theme settings from showing on mobile; up… Conflicts #170: Commit 45de565 pushed by kommunarr
October 26, 2023 19:39 13s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 19:39 13s
Remove descending sort for lists with default sorting optionn Conflicts #169: Commit ba60c42 pushed by kommunarr
October 26, 2023 18:16 14s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 18:16 14s
Replace locale to be local variable in sorting function Conflicts #168: Commit 732fd29 pushed by kommunarr
October 26, 2023 18:11 16s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 18:11 16s
Replace locale to be local variable in sorting functction Conflicts #167: Commit 5abe532 pushed by kommunarr
October 26, 2023 18:10 14s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 18:10 14s
Merge branch 'feat/add-list-display-settings' of github.com:jasonhenr… Conflicts #166: Commit 3f108f8 pushed by kommunarr
October 26, 2023 18:03 11s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 18:03 11s
Merge branch 'feat/add-list-display-settings' of github.com:jasonhenr… Conflicts #165: Commit 92aea64 pushed by kommunarr
October 26, 2023 18:00 16s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 18:00 16s
Merge branch 'feat/add-list-display-settings' of github.com:jasonhenr… Conflicts #164: Commit 8192d6b pushed by kommunarr
October 26, 2023 17:55 11s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 17:55 11s
Update src/renderer/views/Settings/Settings.vue Conflicts #163: Commit 572c94f pushed by kommunarr
October 26, 2023 17:53 16s feat/add-list-display-settings
feat/add-list-display-settings
October 26, 2023 17:53 16s
Update with mobileHidden property Conflicts #162: Commit 5876d59 pushed by kommunarr
October 25, 2023 09:31 13s feat/add-list-display-settings
feat/add-list-display-settings
October 25, 2023 09:31 13s
Implement settings section list sorting options Conflicts #161: Commit fe6471c pushed by kommunarr
October 25, 2023 08:37 12s feat/add-list-display-settings
feat/add-list-display-settings
October 25, 2023 08:37 12s
Implement settings section list sorting options Conflicts #160: Commit ee4442b pushed by kommunarr
October 25, 2023 08:34 14s feat/add-list-display-settings
feat/add-list-display-settings
October 25, 2023 08:34 14s
ProTip! You can narrow down the results and go further in time using created:<2023-10-25 or the other filters available.