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

Add Playlist Sort By Video Duration Conflicts #7706: Pull request #5627 synchronize by Hoverth
September 26, 2024 11:15 15s
September 26, 2024 11:15 15s
Translated using Weblate (Czech) Conflicts #7705: Commit c4214a4 pushed by weblate
September 25, 2024 16:16 2m 13s development
development
September 25, 2024 16:16 2m 13s
Translated using Weblate (Russian) Conflicts #7704: Commit f527c52 pushed by weblate
September 25, 2024 14:15 2m 21s development
development
September 25, 2024 14:15 2m 21s
Translated using Weblate (Hungarian) Conflicts #7703: Commit fd9e2e7 pushed by weblate
September 25, 2024 12:16 2m 16s development
development
September 25, 2024 12:16 2m 16s
Fix persistent cache incorrectly having higher priority then auto fetch feed option Conflicts #7702: Pull request #5743 synchronize by PikachuEXE
September 25, 2024 08:19 10s
September 25, 2024 08:19 10s
Translated using Weblate (Basque) Conflicts #7701: Commit 1a049c0 pushed by weblate
September 23, 2024 23:15 2m 12s development
development
September 23, 2024 23:15 2m 12s
Fix: Video description collapsible and no longer hijacks page scroll Conflicts #7700: Pull request #5665 synchronize by sabs21
September 23, 2024 20:59 13s
September 23, 2024 20:59 13s
Use BCP 47 compatible languages codes for all locales (#5723) Conflicts #7699: Commit 84ee64c pushed by FreeTubeBot
September 23, 2024 20:07 2m 17s development
development
September 23, 2024 20:07 2m 17s
Various minor performance improvements to the subscription page (#5722) Conflicts #7698: Commit b1861ff pushed by FreeTubeBot
September 23, 2024 19:55 2m 11s development
development
September 23, 2024 19:55 2m 11s
Bump sass from 1.78.0 to 1.79.3 (#5737) Conflicts #7697: Commit 74da704 pushed by FreeTubeBot
September 23, 2024 19:52 2m 15s development
development
September 23, 2024 19:52 2m 15s
Bump shaka-player from 4.11.3 to 4.11.4 (#5734) Conflicts #7696: Commit 9de05e4 pushed by FreeTubeBot
September 23, 2024 16:54 2m 16s development
development
September 23, 2024 16:54 2m 16s
Bump electron from 32.1.0 to 32.1.2 (#5738) Conflicts #7695: Commit 8122878 pushed by FreeTubeBot
September 23, 2024 11:01 2m 13s development
development
September 23, 2024 11:01 2m 13s
Bump electron from 32.1.0 to 32.1.2 Conflicts #7694: Pull request #5738 synchronize by dependabot bot
September 23, 2024 10:59 14s
September 23, 2024 10:59 14s
Bump electron from 32.1.0 to 32.1.2 Conflicts #7693: Commit fcca3cc pushed by dependabot bot
September 23, 2024 10:59 10s dependabot/npm_and_yarn/electron-32.1.2
dependabot/npm_and_yarn/electron-32.1.2
September 23, 2024 10:59 10s
Bump the eslint group with 2 updates (#5733) Conflicts #7692: Commit 3ba7649 pushed by FreeTubeBot
September 23, 2024 10:58 2m 14s development
development
September 23, 2024 10:58 2m 14s
Bump the eslint group with 2 updates Conflicts #7691: Pull request #5733 synchronize by dependabot bot
September 23, 2024 10:55 19s
September 23, 2024 10:55 19s
Bump the eslint group with 2 updates Conflicts #7690: Commit 6e00b4b pushed by dependabot bot
September 23, 2024 10:55 11s dependabot/npm_and_yarn/eslint-af87b5999a
dependabot/npm_and_yarn/eslint-af87b5999a
September 23, 2024 10:55 11s
Bump sass from 1.78.0 to 1.79.3 Conflicts #7689: Pull request #5737 synchronize by dependabot bot
September 23, 2024 10:54 23s
September 23, 2024 10:54 23s
Bump sass from 1.78.0 to 1.79.3 Conflicts #7688: Commit f60ecff pushed by dependabot bot
September 23, 2024 10:54 17s dependabot/npm_and_yarn/sass-1.79.3
dependabot/npm_and_yarn/sass-1.79.3
September 23, 2024 10:54 17s
Bump the eslint group with 2 updates Conflicts #7687: Pull request #5733 synchronize by dependabot bot
September 23, 2024 10:54 25s
September 23, 2024 10:54 25s
Bump the eslint group with 2 updates Conflicts #7686: Commit 0ea4f14 pushed by dependabot bot
September 23, 2024 10:54 18s dependabot/npm_and_yarn/eslint-af87b5999a
dependabot/npm_and_yarn/eslint-af87b5999a
September 23, 2024 10:54 18s
Bump sass-loader from 16.0.1 to 16.0.2 (#5735) Conflicts #7685: Commit 8df42c5 pushed by FreeTubeBot
September 23, 2024 10:53 2m 17s development
development
September 23, 2024 10:53 2m 17s
Bump babel-loader from 9.1.3 to 9.2.1 in the babel group (#5732) Conflicts #7684: Commit 0851bec pushed by FreeTubeBot
September 23, 2024 10:52 2m 14s development
development
September 23, 2024 10:52 2m 14s
Bump electron from 32.1.0 to 32.1.2 Conflicts #7683: Commit 6553257 pushed by dependabot bot
September 23, 2024 08:27 11s dependabot/npm_and_yarn/electron-32.1.2
dependabot/npm_and_yarn/electron-32.1.2
September 23, 2024 08:27 11s
Bump sass from 1.78.0 to 1.79.3 Conflicts #7682: Commit ac1d5cc pushed by dependabot bot
September 23, 2024 08:26 10s dependabot/npm_and_yarn/sass-1.79.3
dependabot/npm_and_yarn/sass-1.79.3
September 23, 2024 08:26 10s