Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
192 workflow run results
192 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump eslint-config-prettier from 8.8.0 to 8.9.0 Conflicts #3958: Commit 0b51dbb pushed by dependabot bot
July 31, 2023 08:42 12s dependabot/npm_and_yarn/eslint-config-prettier-8.9.0
dependabot/npm_and_yarn/eslint-config-prettier-8.9.0
July 31, 2023 08:42 12s
Translated using Weblate (Portuguese (Portugal)) Conflicts #3957: Commit 56e1f5a pushed by weblate
July 30, 2023 11:07 2m 13s development
development
July 30, 2023 11:07 2m 13s
Translated using Weblate (Portuguese (Brazil)) Conflicts #3956: Commit b04b0ff pushed by weblate
July 30, 2023 03:09 2m 14s development
development
July 30, 2023 03:09 2m 14s
Translated using Weblate (Bengali) Conflicts #3955: Commit 381a29a pushed by weblate
July 29, 2023 18:07 2m 12s development
development
July 29, 2023 18:07 2m 12s
Add basic support for PotPlayer, MPC-HC, MPC-BE (#3798) Conflicts #3954: Commit 01930e4 pushed by FreeTubeBot
July 29, 2023 10:24 2m 15s development
development
July 29, 2023 10:24 2m 15s
Update ft-input for top navbar search input to behave more like Youtube one Conflicts #3953: Pull request #3793 synchronize by PikachuEXE
July 29, 2023 09:02 13s
July 29, 2023 09:02 13s
Bump electron-builder from 23.6.0 to 24.6.3 (#3815) Conflicts #3952: Commit b1fa248 pushed by FreeTubeBot
July 29, 2023 08:17 2m 15s development
development
July 29, 2023 08:17 2m 15s
Fix playlists for external players with no index support (#3797) Conflicts #3951: Commit 47f69fc pushed by FreeTubeBot
July 28, 2023 07:56 2m 15s development
development
July 28, 2023 07:56 2m 15s
Translated using Weblate (Swedish) Conflicts #3950: Commit b2cbef7 pushed by weblate
July 28, 2023 07:07 2m 12s development
development
July 28, 2023 07:07 2m 12s
Translated using Weblate (Romanian) Conflicts #3949: Commit 55ccfbf pushed by weblate
July 27, 2023 11:08 2m 14s development
development
July 27, 2023 11:08 2m 14s
Fix outdated subscription cache clearing code when "Remove All Subscriptions / Profiles" performed Conflicts #3948: Pull request #3817 synchronize by PikachuEXE
July 27, 2023 06:13 14s
July 27, 2023 06:13 14s
Fix outdated subscription cache clearing code when "Remove All Subscriptions / Profiles" performed Conflicts #3947: Pull request #3817 synchronize by PikachuEXE
July 27, 2023 06:11 16s
July 27, 2023 06:11 16s
Fix: importing subscriptions with terminated channels Conflicts #3946: Pull request #3816 synchronize by ChunkyProgrammer
July 27, 2023 01:49 12s
July 27, 2023 01:49 12s
Fix: importing subscriptions with terminated channels Conflicts #3945: Pull request #3816 synchronize by ChunkyProgrammer
July 27, 2023 01:20 15s
July 27, 2023 01:20 15s
Allow using piped api for comments, playlists, search suggestions and trending Conflicts #3944: Pull request #3559 synchronize by ChunkyProgrammer
July 26, 2023 19:06 15s
July 26, 2023 19:06 15s
Translated using Weblate (Portuguese) Conflicts #3943: Commit 469bc44 pushed by weblate
July 26, 2023 17:05 2m 16s development
development
July 26, 2023 17:05 2m 16s
Translated using Weblate (Italian) Conflicts #3942: Commit d70f604 pushed by weblate
July 26, 2023 03:05 2m 13s development
development
July 26, 2023 03:05 2m 13s
Bump electron-builder from 23.6.0 to 24.6.3 Conflicts #3941: Commit 6481926 pushed by dependabot bot
July 26, 2023 00:55 11s dependabot/npm_and_yarn/electron-builder-24.6.3
dependabot/npm_and_yarn/electron-builder-24.6.3
July 26, 2023 00:55 11s
Translated using Weblate (English (United Kingdom)) Conflicts #3940: Commit 5d24629 pushed by weblate
July 26, 2023 00:06 2m 14s development
development
July 26, 2023 00:06 2m 14s
Update README (nix unofficial support) (#3804) Conflicts #3939: Commit 328b5ab pushed by FreeTubeBot
July 25, 2023 23:28 2m 14s development
development
July 25, 2023 23:28 2m 14s
Bump electron from 22.3.17 to 22.3.18 (#3812) Conflicts #3938: Commit 724c113 pushed by FreeTubeBot
July 25, 2023 22:12 2m 25s development
development
July 25, 2023 22:12 2m 25s
Bump sass from 1.63.6 to 1.64.1 (#3806) Conflicts #3937: Commit 1d347ae pushed by FreeTubeBot
July 25, 2023 22:11 2m 14s development
development
July 25, 2023 22:11 2m 14s
Bump sass from 1.63.6 to 1.64.1 Conflicts #3936: Pull request #3806 synchronize by dependabot bot
July 25, 2023 21:25 11m 11s
July 25, 2023 21:25 11m 11s
Bump sass from 1.63.6 to 1.64.1 Conflicts #3935: Commit eab8188 pushed by dependabot bot
July 25, 2023 21:25 10m 54s dependabot/npm_and_yarn/sass-1.64.1
dependabot/npm_and_yarn/sass-1.64.1
July 25, 2023 21:25 10m 54s
Bump electron from 22.3.17 to 22.3.18 Conflicts #3934: Pull request #3812 synchronize by dependabot bot
July 25, 2023 21:25 11m 2s
July 25, 2023 21:25 11m 2s