Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,175 workflow runs
4,175 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump swiper from 11.1.12 to 11.1.14 (#5709) Conflicts #7632: Commit b86b479 pushed by FreeTubeBot
September 16, 2024 11:07 2m 18s development
development
September 16, 2024 11:07 2m 18s
Bump electron from 32.0.2 to 32.1.0 Conflicts #7631: Commit cd0b7c6 pushed by dependabot bot
September 16, 2024 08:24 10s dependabot/npm_and_yarn/electron-32.1.0
dependabot/npm_and_yarn/electron-32.1.0
September 16, 2024 08:24 10s
Bump swiper from 11.1.12 to 11.1.14 Conflicts #7630: Commit 78f9bcf pushed by dependabot bot
September 16, 2024 08:23 13s dependabot/npm_and_yarn/swiper-11.1.14
dependabot/npm_and_yarn/swiper-11.1.14
September 16, 2024 08:23 13s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7629: Commit fe22f07 pushed by dependabot bot
September 16, 2024 08:23 9s dependabot/npm_and_yarn/npm-run-all2-6.2.3
dependabot/npm_and_yarn/npm-run-all2-6.2.3
September 16, 2024 08:23 9s
Bump shaka-player from 4.11.1 to 4.11.3 Conflicts #7628: Commit 3ab6bff pushed by dependabot bot
September 16, 2024 08:22 12s dependabot/npm_and_yarn/shaka-player-4.11.3
dependabot/npm_and_yarn/shaka-player-4.11.3
September 16, 2024 08:22 12s
Bump the stylelint group with 2 updates Conflicts #7627: Commit 9941058 pushed by dependabot bot
September 16, 2024 08:22 11s dependabot/npm_and_yarn/stylelint-89d65a361a
dependabot/npm_and_yarn/stylelint-89d65a361a
September 16, 2024 08:22 11s
Fix a few memory leaks while tearing down the player (#5698) Conflicts #7626: Commit 5012498 pushed by FreeTubeBot
September 15, 2024 22:17 2m 13s development
development
September 15, 2024 22:17 2m 13s
Improve history import performance and fix some bugs Conflicts #7625: Pull request #5666 synchronize by absidue
September 15, 2024 21:30 14s
September 15, 2024 21:30 14s
Improve history import performance and fix some bugs Conflicts #7624: Pull request #5666 synchronize by absidue
September 15, 2024 21:19 10s
September 15, 2024 21:19 10s
Fix a few memory leaks while tearing down the player Conflicts #7623: Pull request #5698 synchronize by absidue
September 15, 2024 20:54 13s
September 15, 2024 20:54 13s
Fix audio track selection (#5697) Conflicts #7622: Commit ad320ac pushed by FreeTubeBot
September 15, 2024 18:35 2m 12s development
development
September 15, 2024 18:35 2m 12s
Bump shaka-player from 4.10.12 to 4.11.1 (#5677) Conflicts #7621: Commit bedae6c pushed by FreeTubeBot
September 15, 2024 18:30 2m 14s development
development
September 15, 2024 18:30 2m 14s
Translated using Weblate (Czech) Conflicts #7620: Commit 23ce313 pushed by weblate
September 14, 2024 14:10 2m 11s development
development
September 14, 2024 14:10 2m 11s
Fix a few memory leaks while tearing down the player Conflicts #7619: Pull request #5698 synchronize by absidue
September 14, 2024 10:26 10s
September 14, 2024 10:26 10s
Translated using Weblate (Polish) Conflicts #7618: Commit c90674d pushed by weblate
September 13, 2024 17:09 2m 20s development
development
September 13, 2024 17:09 2m 20s
Merge branch 'origin/development' into Weblate. Conflicts #7617: Commit 9460003 pushed by weblate
September 13, 2024 02:09 2m 13s development
development
September 13, 2024 02:09 2m 13s
Bump express from 4.19.2 to 4.20.0 (#5687) Conflicts #7616: Commit d8a6bcc pushed by FreeTubeBot
September 12, 2024 21:12 2m 15s development
development
September 12, 2024 21:12 2m 15s
Translated using Weblate (Turkish) Conflicts #7615: Commit 2d6d122 pushed by weblate
September 12, 2024 17:09 2m 15s development
development
September 12, 2024 17:09 2m 15s
Translated using Weblate (French) Conflicts #7614: Commit 940169e pushed by weblate
September 12, 2024 13:09 2m 14s development
development
September 12, 2024 13:09 2m 14s
Translated using Weblate (Spanish) Conflicts #7613: Commit 0e49cb7 pushed by weblate
September 12, 2024 11:09 2m 13s development
development
September 12, 2024 11:09 2m 13s
Translated using Weblate (Estonian) Conflicts #7612: Commit d048cfe pushed by weblate
September 12, 2024 09:09 2m 21s development
development
September 12, 2024 09:09 2m 21s
Translated using Weblate (Hungarian) Conflicts #7611: Commit c371792 pushed by weblate
September 12, 2024 07:09 2m 13s development
development
September 12, 2024 07:09 2m 13s
Translated using Weblate (Chinese (Traditional Han script)) Conflicts #7610: Commit 6fd60f9 pushed by weblate
September 12, 2024 05:09 2m 17s development
development
September 12, 2024 05:09 2m 17s
Use constants for API names Conflicts #7609: Pull request #5693 synchronize by ChunkyProgrammer
September 12, 2024 04:37 14s
September 12, 2024 04:37 14s
Translated using Weblate (Italian) Conflicts #7608: Commit 2c21390 pushed by weblate
September 12, 2024 03:09 2m 12s development
development
September 12, 2024 03:09 2m 12s