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

* Allow user to attempt quick bookmark without target set Conflicts #588: Commit 0d08002 pushed by PikachuEXE
May 7, 2024 01:56 13s feature/quick-bookmark/improve-ux
feature/quick-bookmark/improve-ux
May 7, 2024 01:56 13s
* Allow user to attempt quick bookmark without target set Conflicts #587: Commit aacadde pushed by PikachuEXE
May 7, 2024 01:39 12s feature/quick-bookmark/improve-ux
feature/quick-bookmark/improve-ux
May 7, 2024 01:39 12s
* Put controls toward the end Conflicts #586: Commit f76c50f pushed by PikachuEXE
May 5, 2024 00:27 14s feature/playlists/no-duplicate-added-by-default
feature/playlists/no-duplicate-added-by-default
May 5, 2024 00:27 14s
* Make additional text work for multi video adding Conflicts #585: Commit 2b282e1 pushed by PikachuEXE
April 30, 2024 02:39 11s feature/playlists/no-duplicate-added-by-default
feature/playlists/no-duplicate-added-by-default
April 30, 2024 02:39 11s
* Make additional text work for multi video adding Conflicts #584: Commit 552b912 pushed by PikachuEXE
April 30, 2024 02:27 12s feature/playlists/no-duplicate-added-by-default
feature/playlists/no-duplicate-added-by-default
April 30, 2024 02:27 12s
^ Update GH action eps1lon/actions-label-merge-conflict Conflicts #583: Commit 658c72e pushed by PikachuEXE
April 29, 2024 03:07 15s update/gh-action/eps1lon-actions-label-merge-conflict
update/gh-action/eps1lon-actions-label-merge-conflict
April 29, 2024 03:07 15s
* Add ready_for_review to pull_request_target.types Conflicts #582: Commit dd671e4 pushed by PikachuEXE
April 17, 2024 01:44 14s ci/no-conflict-detection-on-draft-prs
ci/no-conflict-detection-on-draft-prs
April 17, 2024 01:44 14s
* Replace action jossef/action-set-json-field with `jaywcjlove/gith… Conflicts #581: Commit f9329ea pushed by PikachuEXE
April 17, 2024 01:18 12s test/replace-actions-with-nodejs16-fake-RC
test/replace-actions-with-nodejs16-fake-RC
April 17, 2024 01:18 12s
* Replace action jossef/action-set-json-field with `jaywcjlove/gith… Conflicts #580: Commit f9329ea pushed by PikachuEXE
April 17, 2024 01:07 9s ci/replace-actions-with-nodejs16
ci/replace-actions-with-nodejs16
April 17, 2024 01:07 9s
* Disable merge conflict detection on draft PRs Conflicts #579: Commit d4c7aff pushed by PikachuEXE
April 17, 2024 00:54 11s ci/no-conflict-detection-on-draft-prs
ci/no-conflict-detection-on-draft-prs
April 17, 2024 00:54 11s
* Update tooltip text Conflicts #578: Commit ad780bf pushed by PikachuEXE
April 16, 2024 00:31 11s feature/auto-load-next-page
feature/auto-load-next-page
April 16, 2024 00:31 11s
* Remove comment auto load setting Conflicts #577: Commit c5f0a8c pushed by PikachuEXE
April 15, 2024 03:45 12s feature/auto-load-next-page
feature/auto-load-next-page
April 15, 2024 03:45 12s
Merge branch 'development' into custom-builds/current Conflicts #576: Commit 3eace65 pushed by PikachuEXE
April 2, 2024 08:56 12s custom-builds/current
custom-builds/current
April 2, 2024 08:56 12s
Merge branch 'development' into feature/auto-load-next-page Conflicts #575: Commit 020f991 pushed by PikachuEXE
April 2, 2024 01:33 11s feature/auto-load-next-page
feature/auto-load-next-page
April 2, 2024 01:33 11s
* Stop importing star icon which is now unused Conflicts #574: Commit 1c7f5b2 pushed by PikachuEXE
April 1, 2024 07:25 18s feature/playlist/change-button-icon
feature/playlist/change-button-icon
April 1, 2024 07:25 18s
* Change quick bookmarked indicator to green Conflicts #573: Commit 277e4ec pushed by PikachuEXE
April 1, 2024 07:22 11s feature/playlist/change-button-icon
feature/playlist/change-button-icon
April 1, 2024 07:22 11s
^ Update youtubei.js to 9.2.0 Conflicts #572: Commit 956224d pushed by PikachuEXE
March 31, 2024 23:35 11s update/youtubei.js
update/youtubei.js
March 31, 2024 23:35 11s
* Update icons for add to/remove from quick bookmark target button Conflicts #571: Commit 3c3fe0c pushed by PikachuEXE
March 29, 2024 00:36 9s feature/playlist/change-button-icon
feature/playlist/change-button-icon
March 29, 2024 00:36 9s
* Show no. of to be added videos count in text too Conflicts #570: Commit cf06607 pushed by PikachuEXE
March 27, 2024 00:58 10s feature/playlist/video-in-playlist-count-multi
feature/playlist/video-in-playlist-count-multi
March 27, 2024 00:58 10s
* Use existing element instead of new dummy element Conflicts #569: Commit 14ee845 pushed by PikachuEXE
March 27, 2024 00:48 14s feature/scroll-to-current-chapter
feature/scroll-to-current-chapter
March 27, 2024 00:48 14s
Merge branch 'fix-pageheader-subs' into custom-builds/current Conflicts #568: Commit 3c1f6ec pushed by PikachuEXE
March 26, 2024 01:36 11s custom-builds/current
custom-builds/current
March 26, 2024 01:36 11s
! Fix handling of video data without published Conflicts #567: Commit 8bf43c0 pushed by PikachuEXE
March 20, 2024 01:00 16s fix/published-absence-handling
fix/published-absence-handling
March 20, 2024 01:00 16s
Merge branch 'fix/published-absence-handling' into custom-builds/current Conflicts #566: Commit 1cb0376 pushed by PikachuEXE
March 20, 2024 00:58 13s custom-builds/current
custom-builds/current
March 20, 2024 00:58 13s
Merge branch 'feature/auto-load-next-page' into custom-builds/tmp Conflicts #565: Commit a08fdb8 pushed by PikachuEXE
March 19, 2024 00:22 14s custom-builds/current
custom-builds/current
March 19, 2024 00:22 14s
Merge branch 'development' into feature/auto-load-next-page Conflicts #564: Commit 7293722 pushed by PikachuEXE
March 15, 2024 00:28 12s feature/auto-load-next-page
feature/auto-load-next-page
March 15, 2024 00:28 12s