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 shaka-player from 4.11.1 to 4.11.3 (#5707) Conflicts #7657: Commit 67b8107 pushed by FreeTubeBot
September 17, 2024 15:25 2m 15s development
development
September 17, 2024 15:25 2m 15s
Translated using Weblate (Persian) Conflicts #7656: Commit ce68fb9 pushed by weblate
September 17, 2024 12:09 2m 15s development
development
September 17, 2024 12:09 2m 15s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7655: Pull request #5708 synchronize by dependabot bot
September 17, 2024 10:44 11s
September 17, 2024 10:44 11s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7654: Commit fd215d8 pushed by dependabot bot
September 17, 2024 10:44 11s dependabot/npm_and_yarn/npm-run-all2-6.2.3
dependabot/npm_and_yarn/npm-run-all2-6.2.3
September 17, 2024 10:44 11s
v Downgrade electron-builder 25.x > 24.x (#5712) Conflicts #7653: Commit 4731cfa pushed by FreeTubeBot
September 17, 2024 10:43 2m 14s development
development
September 17, 2024 10:43 2m 14s
Translated using Weblate (Persian) Conflicts #7652: Commit fc1716a pushed by weblate
September 17, 2024 10:09 2m 14s development
development
September 17, 2024 10:09 2m 14s
Translated using Weblate (Persian) Conflicts #7651: Commit b569189 pushed by weblate
September 16, 2024 22:09 2m 13s development
development
September 16, 2024 22:09 2m 13s
Make history page remember last query string & search limit Conflicts #7650: Pull request #5192 synchronize by PikachuEXE
September 16, 2024 21:30 11s
September 16, 2024 21:30 11s
Implement persistent subscription cache Conflicts #7649: Pull request #5185 synchronize by PikachuEXE
September 16, 2024 21:13 12s
September 16, 2024 21:13 12s
Translated using Weblate (Flemish (West)) Conflicts #7648: Commit 3529520 pushed by weblate
September 16, 2024 18:09 2m 17s development
development
September 16, 2024 18:09 2m 17s
Added translation using Weblate (Flemish (West)) Conflicts #7647: Commit e05a8f9 pushed by weblate
September 16, 2024 16:35 2m 16s development
development
September 16, 2024 16:35 2m 16s
Translated using Weblate (Slovak) Conflicts #7646: Commit 070671d pushed by weblate
September 16, 2024 13:09 2m 19s development
development
September 16, 2024 13:09 2m 19s
Improve history import performance and fix some bugs (#5666) Conflicts #7645: Commit 01dbdad pushed by FreeTubeBot
September 16, 2024 11:13 6m 48s development
development
September 16, 2024 11:13 6m 48s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7644: Pull request #5708 synchronize by dependabot bot
September 16, 2024 11:11 9m 2s
September 16, 2024 11:11 9m 2s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7643: Commit 2bc396b pushed by dependabot bot
September 16, 2024 11:11 8m 56s dependabot/npm_and_yarn/npm-run-all2-6.2.3
dependabot/npm_and_yarn/npm-run-all2-6.2.3
September 16, 2024 11:11 8m 56s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7642: Pull request #5708 synchronize by dependabot bot
September 16, 2024 11:10 9m 22s
September 16, 2024 11:10 9m 22s
Bump npm-run-all2 from 6.2.2 to 6.2.3 Conflicts #7641: Commit 98a3661 pushed by dependabot bot
September 16, 2024 11:10 9m 8s dependabot/npm_and_yarn/npm-run-all2-6.2.3
dependabot/npm_and_yarn/npm-run-all2-6.2.3
September 16, 2024 11:10 9m 8s
Bump electron from 32.0.2 to 32.1.0 (#5710) Conflicts #7640: Commit 621d518 pushed by FreeTubeBot
September 16, 2024 11:10 7m 32s development
development
September 16, 2024 11:10 7m 32s
Bump shaka-player from 4.11.1 to 4.11.3 Conflicts #7639: Pull request #5707 synchronize by dependabot bot
September 16, 2024 11:09 7m 35s
September 16, 2024 11:09 7m 35s
Bump shaka-player from 4.11.1 to 4.11.3 Conflicts #7638: Commit 34c755c pushed by dependabot bot
September 16, 2024 11:09 6m 56s dependabot/npm_and_yarn/shaka-player-4.11.3
dependabot/npm_and_yarn/shaka-player-4.11.3
September 16, 2024 11:09 6m 56s
Local API: Use IOS HLS manifest for livestreams (#5705) Conflicts #7637: Commit 18f8741 pushed by FreeTubeBot
September 16, 2024 11:09 7m 25s development
development
September 16, 2024 11:09 7m 25s
Translated using Weblate (Slovak) Conflicts #7636: Commit 9101171 pushed by weblate
September 16, 2024 11:09 2m 15s development
development
September 16, 2024 11:09 2m 15s
Bump the stylelint group with 2 updates (#5706) Conflicts #7635: Commit d1f137f pushed by FreeTubeBot
September 16, 2024 11:09 12s development
development
September 16, 2024 11:09 12s
Bump shaka-player from 4.11.1 to 4.11.3 Conflicts #7634: Pull request #5707 synchronize by dependabot bot
September 16, 2024 11:08 4m 15s
September 16, 2024 11:08 4m 15s
Bump shaka-player from 4.11.1 to 4.11.3 Conflicts #7633: Commit 8f82b06 pushed by dependabot bot
September 16, 2024 11:08 14s dependabot/npm_and_yarn/shaka-player-4.11.3
dependabot/npm_and_yarn/shaka-player-4.11.3
September 16, 2024 11:08 14s