Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
403 workflow runs
403 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Make playlist selector look more selectable (cursor: pointer) Conflicts #413: Commit d321aec pushed by PikachuEXE
November 1, 2023 01:08 13s feature/playlist-2023-05
feature/playlist-2023-05
November 1, 2023 01:08 13s
Use template for element with v-if only Conflicts #412: Commit 976f6c7 pushed by PikachuEXE
November 1, 2023 00:57 13s feature/playlist-2023-05
feature/playlist-2023-05
November 1, 2023 00:57 13s
Remove infoData Conflicts #411: Commit a032616 pushed by PikachuEXE
October 28, 2023 02:07 11s feature/playlist-2023-05
feature/playlist-2023-05
October 28, 2023 02:07 11s
$ Just use ?. Conflicts #410: Commit 9b2162c pushed by PikachuEXE
October 27, 2023 00:24 11s feature/playlist-2023-05
feature/playlist-2023-05
October 27, 2023 00:24 11s
! Fix reverse condition Conflicts #409: Commit 2803d21 pushed by PikachuEXE
October 27, 2023 00:23 9s feature/playlist-2023-05
feature/playlist-2023-05
October 27, 2023 00:23 9s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #408: Commit 7cd0aec pushed by PikachuEXE
October 26, 2023 00:11 14s feature/playlist-2023-05
feature/playlist-2023-05
October 26, 2023 00:11 14s
* Make changes from code review Conflicts #407: Commit 37107b8 pushed by PikachuEXE
October 23, 2023 06:29 15s dev/reload-modified-locale
dev/reload-modified-locale
October 23, 2023 06:29 15s
* Make sort option text translatable Conflicts #406: Commit dbcd9fd pushed by PikachuEXE
October 21, 2023 07:06 14s feature/playlist-2023-05
feature/playlist-2023-05
October 21, 2023 07:06 14s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #405: Commit bf09e46 pushed by PikachuEXE
October 21, 2023 03:27 13s feature/playlist-2023-05
feature/playlist-2023-05
October 21, 2023 03:27 13s
- Remove import video while creating playlist related code Conflicts #404: Commit 8bc5f2d pushed by PikachuEXE
October 19, 2023 08:27 15s feature/playlist-2023-05
feature/playlist-2023-05
October 19, 2023 08:27 15s
* Ensure local playlist ID won't conflict with remote playlist ID Conflicts #403: Commit 847ae77 pushed by PikachuEXE
October 19, 2023 06:43 12s feature/playlist-2023-05
feature/playlist-2023-05
October 19, 2023 06:43 12s
! Fix single playlist view item index style Conflicts #402: Commit 41212bb pushed by PikachuEXE
October 18, 2023 00:52 13s fix/single-playlist-view-numbering-space
fix/single-playlist-view-numbering-space
October 18, 2023 00:52 13s
* Add watch external file plugin in dev mode only Conflicts #401: Commit 1c833e2 pushed by PikachuEXE
October 17, 2023 00:32 11s dev/reload-modified-locale
dev/reload-modified-locale
October 17, 2023 00:32 11s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #400: Commit 7dd6d97 pushed by PikachuEXE
October 17, 2023 00:30 14s feature/playlist-2023-05
feature/playlist-2023-05
October 17, 2023 00:30 14s
* Replace deprecated registerBufferProtocol Conflicts #399: Commit a1d37a9 pushed by PikachuEXE
October 16, 2023 09:01 19s upgrade/electron-26
upgrade/electron-26
October 16, 2023 09:01 19s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #398: Commit 1bf04e6 pushed by PikachuEXE
October 11, 2023 00:21 15s feature/playlist-2023-05
feature/playlist-2023-05
October 11, 2023 00:21 15s
Merge branch 'feature/playlist-2023-05' into custom-builds/current Conflicts #397: Commit 8a1cc4e pushed by PikachuEXE
October 8, 2023 00:26 17s custom-builds/current
custom-builds/current
October 8, 2023 00:26 17s
yarn run lint-style-fix Conflicts #396: Commit 2656915 pushed by PikachuEXE
October 8, 2023 00:26 17s feature/playlist-2023-05
feature/playlist-2023-05
October 8, 2023 00:26 17s
Merge branch 'cookies' into custom-builds/current Conflicts #395: Commit 22bdb97 pushed by PikachuEXE
October 8, 2023 00:10 17s custom-builds/current
custom-builds/current
October 8, 2023 00:10 17s
Merge branch 'development' into feature/playlist-2023-05 Conflicts #394: Commit 21be0b1 pushed by PikachuEXE
October 8, 2023 00:09 12s feature/playlist-2023-05
feature/playlist-2023-05
October 8, 2023 00:09 12s
! Fix watch page video published time parsing Conflicts #393: Commit 2354f4d pushed by PikachuEXE
October 6, 2023 09:39 11s fix/watch-page-publish-time
fix/watch-page-publish-time
October 6, 2023 09:39 11s
Translated using Weblate (Serbian) Conflicts #392: Commit 560dcf6 pushed by PikachuEXE
October 5, 2023 06:40 19s development
development
October 5, 2023 06:40 19s
! Fix playlist item fetching for local API Conflicts #391: Commit a85879a pushed by PikachuEXE
October 5, 2023 06:26 17s fix/playlist-empty-continuation-response
fix/playlist-empty-continuation-response
October 5, 2023 06:26 17s
* Add watch external file plugin in dev mode only Conflicts #390: Commit 07da6d0 pushed by PikachuEXE
October 3, 2023 13:31 18s dev/reload-modified-locale
dev/reload-modified-locale
October 3, 2023 13:31 18s
! Fix ft-video having different URLs in links Conflicts #389: Commit 25c75ce pushed by PikachuEXE
September 29, 2023 00:55 10s feature/playlist-2023-05
feature/playlist-2023-05
September 29, 2023 00:55 10s
ProTip! You can narrow down the results and go further in time using created:<2023-09-29 or the other filters available.