Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,079 workflow run results
1,079 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Translated using Weblate (Danish) Conflicts #5956: Commit 43c0f2f pushed by weblate
March 13, 2024 23:02 4m 10s development
development
March 13, 2024 23:02 4m 10s
Add the ability to view Invidious playlists Conflicts #5955: Pull request #4299 synchronize by ChunkyProgrammer
March 13, 2024 20:40 13s
March 13, 2024 20:40 13s
Allow using piped api for comments, playlists, search suggestions and trending Conflicts #5954: Pull request #3559 synchronize by ChunkyProgrammer
March 13, 2024 20:39 9s
March 13, 2024 20:39 9s
Vue3 Migration Conflicts #5953: Pull request #4428 synchronize by ChunkyProgrammer
March 13, 2024 20:38 12s
March 13, 2024 20:38 12s
Vue3 Migration Conflicts #5952: Pull request #4428 synchronize by ChunkyProgrammer
March 13, 2024 20:36 11s
March 13, 2024 20:36 11s
Don't fetch additional data when importing subscriptions Conflicts #5951: Pull request #4340 synchronize by ChunkyProgrammer
March 13, 2024 20:31 11s
March 13, 2024 20:31 11s
Update most paginated places to auto load next page (except comments) Conflicts #5950: Pull request #4565 synchronize by PikachuEXE
March 13, 2024 06:41 12s
March 13, 2024 06:41 12s
Add search playlists with matching videos function Conflicts #5949: Pull request #4537 synchronize by PikachuEXE
March 13, 2024 06:38 25s
March 13, 2024 06:38 25s
Fix handling of video published date in video lists (#4752) Conflicts #5948: Commit 98aded9 pushed by FreeTubeBot
March 13, 2024 06:26 2m 34s development
development
March 13, 2024 06:26 2m 34s
Add search playlists with matching videos function Conflicts #5947: Pull request #4537 synchronize by PikachuEXE
March 13, 2024 00:21 14s
March 13, 2024 00:21 14s
Translated using Weblate (Dutch) Conflicts #5946: Commit dc3f73e pushed by weblate
March 12, 2024 20:01 2m 12s development
development
March 12, 2024 20:01 2m 12s
Translated using Weblate (Chinese (Simplified)) Conflicts #5945: Commit 665ec28 pushed by weblate
March 12, 2024 04:02 2m 16s development
development
March 12, 2024 04:02 2m 16s
Bump lefthook from 1.6.4 to 1.6.5 (#4758) Conflicts #5944: Commit 805d271 pushed by FreeTubeBot
March 11, 2024 11:17 2m 14s development
development
March 11, 2024 11:17 2m 14s
Bump marked from 12.0.0 to 12.0.1 (#4757) Conflicts #5943: Commit 2794c46 pushed by FreeTubeBot
March 11, 2024 11:16 2m 13s development
development
March 11, 2024 11:16 2m 13s
Bump electron from 29.1.0 to 29.1.1 (#4756) Conflicts #5942: Commit 3e18a81 pushed by FreeTubeBot
March 11, 2024 11:15 4m 14s development
development
March 11, 2024 11:15 4m 14s
Bump lefthook from 1.6.4 to 1.6.5 Conflicts #5941: Commit d529fbf pushed by dependabot bot
March 11, 2024 08:54 11s dependabot/npm_and_yarn/lefthook-1.6.5
dependabot/npm_and_yarn/lefthook-1.6.5
March 11, 2024 08:54 11s
Bump marked from 12.0.0 to 12.0.1 Conflicts #5940: Commit 8463327 pushed by dependabot bot
March 11, 2024 08:53 12s dependabot/npm_and_yarn/marked-12.0.1
dependabot/npm_and_yarn/marked-12.0.1
March 11, 2024 08:53 12s
Bump electron from 29.1.0 to 29.1.1 Conflicts #5939: Commit 088f586 pushed by dependabot bot
March 11, 2024 08:52 14s dependabot/npm_and_yarn/electron-29.1.1
dependabot/npm_and_yarn/electron-29.1.1
March 11, 2024 08:52 14s
Translated using Weblate (Portuguese) Conflicts #5938: Commit 9cbcdd2 pushed by weblate
March 10, 2024 22:01 2m 11s development
development
March 10, 2024 22:01 2m 11s
Improve touch controls for dash quality selector (#4750) Conflicts #5937: Commit 551b513 pushed by FreeTubeBot
March 10, 2024 22:00 2m 13s development
development
March 10, 2024 22:00 2m 13s
Translated using Weblate (Serbian) Conflicts #5936: Commit 17818ca pushed by weblate
March 9, 2024 17:01 2m 11s development
development
March 9, 2024 17:01 2m 11s
Fix handling of video published date in video lists Conflicts #5935: Pull request #4752 synchronize by absidue
March 9, 2024 16:51 13s
March 9, 2024 16:51 13s
Fix handling of video published date in video lists Conflicts #5934: Pull request #4752 synchronize by absidue
March 9, 2024 15:36 13s
March 9, 2024 15:36 13s
Add search playlists with matching videos function Conflicts #5933: Pull request #4537 synchronize by PikachuEXE
March 9, 2024 02:52 10s
March 9, 2024 02:52 10s
Translated using Weblate (Spanish) Conflicts #5932: Commit e99a60e pushed by weblate
March 8, 2024 23:01 2m 15s development
development
March 8, 2024 23:01 2m 15s