Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,902 workflow runs
3,902 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Remove upperCase on various places Conflicts #11603: Pull request #8267 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
9s
9s
Translated using Weblate (French) Conflicts #11602: Commit 050611c pushed by weblate
2m 10s development
development
2m 10s
Fix subscription count display on watch page with IV API (#8255) Conflicts #11601: Commit 8e66ac2 pushed by FreeTubeBot
2m 11s development
development
2m 11s
Specify window position in constructor for better wayland compatibili… Conflicts #11600: Commit 10829ad pushed by FreeTubeBot
2m 14s development
development
2m 14s
Change profile icon to include lowercase letters (#8253) Conflicts #11599: Commit d50e3d4 pushed by FreeTubeBot
2m 9s development
development
2m 9s
Translated using Weblate (German) Conflicts #11598: Commit 1ed5cd5 pushed by weblate
2m 11s development
development
2m 11s
Translated using Weblate (Chinese (Traditional Han script)) Conflicts #11597: Commit a0bb74f pushed by weblate
2m 9s development
development
2m 9s
Local API: Implement SABR for VODs Conflicts #11596: Pull request #8047 synchronize by PikachuEXE
8s
8s
Translated using Weblate (Portuguese (Brazil)) Conflicts #11595: Commit 4b1bb5d pushed by weblate
2m 10s development
development
2m 10s
Local API: Implement SABR for VODs Conflicts #11594: Pull request #8047 synchronize by PikachuEXE
8s
8s
Fix subscription count display on watch page with IV API Conflicts #11593: Pull request #8255 synchronize by PikachuEXE
10s
10s
Translated using Weblate (Turkish) Conflicts #11592: Commit cf4f48b pushed by weblate
2m 10s development
development
2m 10s
! Fix top nav cannot search in new window (#8254) Conflicts #11591: Commit 047c3e6 pushed by FreeTubeBot
2m 8s development
development
2m 8s
Bump vue from 3.5.22 to 3.5.24 (#8257) Conflicts #11590: Commit a5b7e77 pushed by FreeTubeBot
2m 9s development
development
2m 9s
Translated using Weblate (Czech) Conflicts #11589: Commit 9895c8b pushed by weblate
2m 8s development
development
2m 8s
Bump vue from 3.5.22 to 3.5.24 Conflicts #11588: Pull request #8257 synchronize by dependabot bot
12s
12s
Bump vue from 3.5.22 to 3.5.24 Conflicts #11587: Commit 5788262 pushed by dependabot bot
9s dependabot/npm_and_yarn/vue-3.5.24
dependabot/npm_and_yarn/vue-3.5.24
9s
Merge branch 'origin/development' into Weblate. Conflicts #11586: Commit 1f59f22 pushed by weblate
2m 11s development
development
2m 11s
Bump vue from 3.5.22 to 3.5.24 Conflicts #11585: Pull request #8257 synchronize by dependabot bot
10s
10s
Bump vue from 3.5.22 to 3.5.24 Conflicts #11584: Commit f81ef59 pushed by dependabot bot
10s dependabot/npm_and_yarn/vue-3.5.24
dependabot/npm_and_yarn/vue-3.5.24
10s
Bump electron from 38.4.0 to 39.1.1 Conflicts #11583: Pull request #8259 synchronize by dependabot bot
12s
12s
Bump electron from 38.4.0 to 39.1.1 Conflicts #11582: Commit bc702cd pushed by dependabot bot
9s dependabot/npm_and_yarn/electron-39.1.1
dependabot/npm_and_yarn/electron-39.1.1
9s
Bump lefthook from 2.0.2 to 2.0.3 (#8258) Conflicts #11581: Commit c687a1c pushed by FreeTubeBot
2m 10s development
development
2m 10s
Bump the eslint group with 2 updates (#8256) Conflicts #11580: Commit 17650fd pushed by FreeTubeBot
2m 7s development
development
2m 7s
Bump marked from 16.4.1 to 17.0.0 (#8260) Conflicts #11579: Commit 7352534 pushed by FreeTubeBot
2m 9s development
development
2m 9s