Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
405 workflow runs
405 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

* Put currentTab value into proper place params instead of query Conflicts #713: Commit 49cd449 pushed by PikachuEXE
October 13, 2024 00:24 10s feature/history/remember-search-query
feature/history/remember-search-query
October 13, 2024 00:24 10s
Merge branch 'development' into feature/history/remember-search-query Conflicts #712: Commit 1be051e pushed by PikachuEXE
October 12, 2024 08:24 11s feature/history/remember-search-query
feature/history/remember-search-query
October 12, 2024 08:24 11s
Update src/renderer/components/data-settings/data-settings.js Conflicts #711: Commit edd3ea5 pushed by PikachuEXE
October 10, 2024 10:40 11s feature/playlist-smart-merge
feature/playlist-smart-merge
October 10, 2024 10:40 11s
~ Update comment Conflicts #710: Commit baf4b45 pushed by PikachuEXE
October 10, 2024 00:12 16s feature/playlist-smart-merge
feature/playlist-smart-merge
October 10, 2024 00:12 16s
Merge branch 'Zeabyte/development' into custom-builds/tmp Conflicts #709: Commit ab1bee8 pushed by PikachuEXE
October 7, 2024 22:59 11s custom-builds/current
custom-builds/current
October 7, 2024 22:59 11s
Merge branch 'development' into feature/history/remember-search-query Conflicts #708: Commit 707f950 pushed by PikachuEXE
October 7, 2024 22:58 11s feature/history/remember-search-query
feature/history/remember-search-query
October 7, 2024 22:58 11s
* Remove vue 3 rules, improve imports Conflicts #707: Commit ab3d534 pushed by PikachuEXE
October 5, 2024 11:50 11s upgrade/eslint-9
upgrade/eslint-9
October 5, 2024 11:50 11s
* Merge config files Conflicts #706: Commit f1b3e48 pushed by PikachuEXE
October 5, 2024 03:11 14s upgrade/eslint-9
upgrade/eslint-9
October 5, 2024 03:11 14s
* Use flat config when possible, remove unused stuff Conflicts #705: Commit 035049f pushed by PikachuEXE
October 5, 2024 02:52 10s upgrade/eslint-9
upgrade/eslint-9
October 5, 2024 02:52 10s
* Import list of locales from another file Conflicts #704: Commit 2106782 pushed by PikachuEXE
October 5, 2024 02:45 10s upgrade/eslint-9
upgrade/eslint-9
October 5, 2024 02:45 10s
Merge branch 'feature/playlist-smart-merge' into custom-builds/playli… Conflicts #703: Commit 0b00550 pushed by PikachuEXE
October 5, 2024 02:34 14s custom-builds/playlist-smart-merge
custom-builds/playlist-smart-merge
October 5, 2024 02:34 14s
* Update playlist import to only add duplicate playlist items sometimes Conflicts #702: Commit f3c6291 pushed by PikachuEXE
October 3, 2024 01:52 14s feature/playlist-smart-merge
feature/playlist-smart-merge
October 3, 2024 01:52 14s
! Fix strange outline on nav buttons Conflicts #701: Commit 52ad095 pushed by PikachuEXE
October 3, 2024 01:45 13s feature/history/remember-search-query
feature/history/remember-search-query
October 3, 2024 01:45 13s
^ Upgrade electron-builder 24 > 25 Conflicts #700: Commit c32e275 pushed by PikachuEXE
October 3, 2024 01:18 14s update/electron-builder
update/electron-builder
October 3, 2024 01:18 14s
! Fix config for vue 2 Conflicts #699: Commit c4d6ea2 pushed by PikachuEXE
October 2, 2024 01:21 12s upgrade/eslint-9
upgrade/eslint-9
October 2, 2024 01:21 12s
* Save more options Conflicts #698: Commit 54f4331 pushed by PikachuEXE
October 1, 2024 03:34 13s feature/history/remember-search-query
feature/history/remember-search-query
October 1, 2024 03:34 13s
* Update config for json to use flat config too Conflicts #697: Commit 115a182 pushed by PikachuEXE
October 1, 2024 02:02 10s upgrade/eslint-9
upgrade/eslint-9
October 1, 2024 02:02 10s
* Fix some issues, update rules for Vue 2.x Conflicts #696: Commit 8c61432 pushed by PikachuEXE
October 1, 2024 01:39 15s upgrade/eslint-9
upgrade/eslint-9
October 1, 2024 01:39 15s
! Fix persistent cache incorrectly having higher priority then auto f… Conflicts #695: Commit 18b191d pushed by PikachuEXE
September 25, 2024 08:19 13s fix/persistent-cache-vs-auto-fetch
fix/persistent-cache-vs-auto-fetch
September 25, 2024 08:19 13s
! Fix persistent cache incorrectly having higher priority then auto f… Conflicts #694: Commit 73eb790 pushed by PikachuEXE
September 24, 2024 00:57 12s fix/persistent-cache-vs-auto-fetch
fix/persistent-cache-vs-auto-fetch
September 24, 2024 00:57 12s
* Allow unsetting quick bookmark target and prompt to set it later wh… Conflicts #693: Commit 8124dd5 pushed by PikachuEXE
September 21, 2024 03:46 10s feature/quick-bookmark/improve-ux
feature/quick-bookmark/improve-ux
September 21, 2024 03:46 10s
Merge branch 'feature/quick-bookmark/improve-ux' into custom-builds/tmp Conflicts #692: Commit b7f5903 pushed by PikachuEXE
September 21, 2024 03:46 11s custom-builds/current
custom-builds/current
September 21, 2024 03:46 11s
Merge branch 'development' into feature/history/remember-search-query Conflicts #691: Commit ce7c712 pushed by PikachuEXE
September 21, 2024 03:43 14s feature/history/remember-search-query
feature/history/remember-search-query
September 21, 2024 03:43 14s
Merge branch 'feature/history/remember-search-query' into custom-buil… Conflicts #690: Commit aae081f pushed by PikachuEXE
September 16, 2024 21:45 13s custom-builds/current
custom-builds/current
September 16, 2024 21:45 13s
Merge branch 'development' into feature/history/remember-search-query Conflicts #689: Commit 47222b9 pushed by PikachuEXE
September 16, 2024 21:30 28m 38s feature/history/remember-search-query
feature/history/remember-search-query
September 16, 2024 21:30 28m 38s