Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,420 workflow runs
4,420 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Migrate ft-slider to the composition api Conflicts #9271: Pull request #6677 synchronize by MarmadileManteater
January 31, 2025 03:18 10s
January 31, 2025 03:18 10s
Merge branch 'development' Conflicts #9270: Commit a665c6a pushed by PrestonN
January 31, 2025 02:43 10s v0.23.0-beta
v0.23.0-beta
January 31, 2025 02:43 10s
Merge branch 'development' Conflicts #9269: Commit a665c6a pushed by PrestonN
January 31, 2025 02:22 9s master
master
January 31, 2025 02:22 9s
Update release.yml Conflicts #9268: Commit 1d5d129 pushed by PrestonN
January 31, 2025 02:21 2m 11s development
development
January 31, 2025 02:21 2m 11s
Update release.yml Conflicts #9267: Commit 9466fdb pushed by PrestonN
January 31, 2025 02:20 10s PrestonN-patch-1
PrestonN-patch-1
January 31, 2025 02:20 10s
Merge branch 'development' Conflicts #9266: Commit e7f0eda pushed by PrestonN
January 31, 2025 01:52 11s master
master
January 31, 2025 01:52 11s
Update release.yml Conflicts #9265: Commit 7328dbd pushed by PrestonN
January 31, 2025 01:51 2m 11s development
development
January 31, 2025 01:51 2m 11s
Merge branch 'development' Conflicts #9264: Commit 4a9382c pushed by PrestonN
January 31, 2025 01:21 10s master
master
January 31, 2025 01:21 10s
Bump version number to v0.23.0 Conflicts #9263: Commit e2c4b12 pushed by PrestonN
January 31, 2025 01:02 2m 15s development
development
January 31, 2025 01:02 2m 15s
Add Creative Commons License to Description of Videos (#6614) Conflicts #9262: Commit 8de1026 pushed by FreeTubeBot
January 31, 2025 00:39 2m 14s development
development
January 31, 2025 00:39 2m 14s
Cleanup Gray theme Conflicts #9261: Pull request #6674 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
January 31, 2025 00:05 12s
January 31, 2025 00:05 12s
Merge branch 'origin/development' into Weblate. Conflicts #9260: Commit 47d4103 pushed by weblate
January 30, 2025 23:46 2m 13s development
development
January 30, 2025 23:46 2m 13s
Cleanup Gray theme Conflicts #9259: Pull request #6674 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
January 30, 2025 23:33 12s
January 30, 2025 23:33 12s
Add icons to page headers + subscription tabs Conflicts #9258: Pull request #6669 synchronize by ChunkyProgrammer
January 30, 2025 22:15 10s
January 30, 2025 22:15 10s
Only refresh current trending tab (#6667) Conflicts #9257: Commit ffdd1ec pushed by FreeTubeBot
January 30, 2025 21:29 2m 15s development
development
January 30, 2025 21:29 2m 15s
Add icons to page headers + subscription tabs Conflicts #9256: Pull request #6669 synchronize by ChunkyProgrammer
January 30, 2025 20:13 15s
January 30, 2025 20:13 15s
Add Everforest color themes Conflicts #9255: Pull request #6468 synchronize by DontBlameMe99
January 30, 2025 19:15 15s
January 30, 2025 19:15 15s
Only refresh current trending tab Conflicts #9254: Pull request #6667 synchronize by ChunkyProgrammer
January 30, 2025 19:02 14s
January 30, 2025 19:02 14s
Add local api support for viewing individual community posts + comments Conflicts #9253: Pull request #6491 synchronize by ChunkyProgrammer
January 30, 2025 17:21 11s
January 30, 2025 17:21 11s
Add support for channel's Courses tab Conflicts #9252: Pull request #6641 synchronize by ChunkyProgrammer
January 30, 2025 17:20 10s
January 30, 2025 17:20 10s
Translated using Weblate (Chinese (Traditional Han script)) Conflicts #9251: Commit 80b46da pushed by weblate
January 30, 2025 11:02 2m 12s development
development
January 30, 2025 11:02 2m 12s
Translated using Weblate (Arabic) Conflicts #9250: Commit 646469b pushed by weblate
January 29, 2025 13:02 2m 13s development
development
January 29, 2025 13:02 2m 13s
Add Everforest color themes Conflicts #9249: Pull request #6468 synchronize by DontBlameMe99
January 29, 2025 06:46 12s
January 29, 2025 06:46 12s
Add Creative Commons License to Description of Videos Conflicts #9248: Pull request #6614 synchronize by SudharakaP
January 28, 2025 21:01 13s
January 28, 2025 21:01 13s
Add Creative Commons License to Description of Videos Conflicts #9247: Pull request #6614 synchronize by SudharakaP
January 28, 2025 20:56 11s
January 28, 2025 20:56 11s