Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
193 workflow run results
193 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Translated using Weblate (Italian) Conflicts #4058: Commit 3819e39 pushed by weblate
August 13, 2023 02:52 2m 14s development
development
August 13, 2023 02:52 2m 14s
Fix audio formats on long videos getting throttled (#3870) Conflicts #4057: Commit 3a80c81 pushed by FreeTubeBot
August 12, 2023 02:39 2m 14s development
development
August 12, 2023 02:39 2m 14s
Refactoring to community polls & fixes for quizzes Conflicts #4056: Pull request #3865 synchronize by lamemakes
August 11, 2023 17:23 16s
August 11, 2023 17:23 16s
Refactoring to community polls & fixes for quizzes Conflicts #4055: Pull request #3865 synchronize by lamemakes
August 11, 2023 16:47 11s
August 11, 2023 16:47 11s
Refactoring to community polls & fixes for quizzes Conflicts #4054: Pull request #3865 synchronize by lamemakes
August 11, 2023 16:33 12s
August 11, 2023 16:33 12s
Refactoring to community polls & fixes for quizzes Conflicts #4053: Pull request #3865 synchronize by lamemakes
August 11, 2023 16:21 11s
August 11, 2023 16:21 11s
Refactoring to community polls & fixes for quizzes Conflicts #4052: Pull request #3865 synchronize by lamemakes
August 11, 2023 16:20 15s
August 11, 2023 16:20 15s
Main+Store: NeDB persistence and integrity + dependency update (#3845) Conflicts #4051: Commit 079417d pushed by FreeTubeBot
August 10, 2023 20:38 2m 16s development
development
August 10, 2023 20:38 2m 16s
Ignore broken audio tracks for videos with multiple audio tracks Conflicts #4050: Pull request #3851 synchronize by absidue
August 10, 2023 20:22 14s
August 10, 2023 20:22 14s
Translated using Weblate (Japanese) Conflicts #4049: Commit d3a8988 pushed by weblate
August 10, 2023 18:50 2m 13s development
development
August 10, 2023 18:50 2m 13s
Add initial TypeScript support Conflicts #4048: Pull request #3867 synchronize by magne4000
August 10, 2023 13:37 16s
August 10, 2023 13:37 16s
Add initial TypeScript support Conflicts #4047: Pull request #3867 synchronize by magne4000
August 10, 2023 13:36 15s
August 10, 2023 13:36 15s
Add initial TypeScript support Conflicts #4046: Pull request #3867 synchronize by magne4000
August 10, 2023 13:35 16s
August 10, 2023 13:35 16s
Add initial TypeScript support Conflicts #4045: Pull request #3867 synchronize by magne4000
August 10, 2023 08:57 16s
August 10, 2023 08:57 16s
Add initial TypeScript support Conflicts #4044: Pull request #3867 synchronize by magne4000
August 10, 2023 08:44 12s
August 10, 2023 08:44 12s
Improve Accessibility of Profiles Conflicts #4043: Pull request #3863 synchronize by ChunkyProgrammer
August 9, 2023 01:21 17s
August 9, 2023 01:21 17s
Improve Accessibility of Profiles Conflicts #4042: Pull request #3863 synchronize by ChunkyProgrammer
August 9, 2023 00:57 14s
August 9, 2023 00:57 14s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 (#3857) Conflicts #4041: Commit aa1d422 pushed by FreeTubeBot
August 7, 2023 20:05 2m 16s development
development
August 7, 2023 20:05 2m 16s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4040: Pull request #3857 synchronize by dependabot bot
August 7, 2023 19:46 11s
August 7, 2023 19:46 11s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4039: Commit c2f5094 pushed by dependabot bot
August 7, 2023 19:46 12s dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
August 7, 2023 19:46 12s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 (#3856) Conflicts #4038: Commit 2ded3d0 pushed by FreeTubeBot
August 7, 2023 19:43 2m 16s development
development
August 7, 2023 19:43 2m 16s
Main+Store: NeDB persistence and integrity + dependency update Conflicts #4037: Pull request #3845 synchronize by Svallinn
August 7, 2023 18:28 12s
August 7, 2023 18:28 12s
Merge branch 'development' into feat+fix/nedb-persistence Conflicts #4036: Commit f922f84 pushed by Svallinn
August 7, 2023 18:28 10s feat+fix/nedb-persistence
feat+fix/nedb-persistence
August 7, 2023 18:28 10s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 Conflicts #4035: Pull request #3856 synchronize by dependabot bot
August 7, 2023 18:16 10m 5s
August 7, 2023 18:16 10m 5s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 Conflicts #4034: Commit 505e9de pushed by dependabot bot
August 7, 2023 18:16 10m 0s dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
August 7, 2023 18:16 10m 0s