Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump sass from 1.78.0 to 1.79.3 Conflicts #7682: Commit ac1d5cc pushed by dependabot bot
September 23, 2024 08:26 10s dependabot/npm_and_yarn/sass-1.79.3
dependabot/npm_and_yarn/sass-1.79.3
September 23, 2024 08:26 10s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7681: Commit ba3249f pushed by dependabot bot
September 23, 2024 08:26 9s dependabot/npm_and_yarn/electron-builder-25.0.5
dependabot/npm_and_yarn/electron-builder-25.0.5
September 23, 2024 08:26 9s
Bump sass-loader from 16.0.1 to 16.0.2 Conflicts #7680: Commit d0af4b1 pushed by dependabot bot
September 23, 2024 08:25 11s dependabot/npm_and_yarn/sass-loader-16.0.2
dependabot/npm_and_yarn/sass-loader-16.0.2
September 23, 2024 08:25 11s
Bump shaka-player from 4.11.3 to 4.11.4 Conflicts #7679: Commit 3d69248 pushed by dependabot bot
September 23, 2024 08:25 12s dependabot/npm_and_yarn/shaka-player-4.11.4
dependabot/npm_and_yarn/shaka-player-4.11.4
September 23, 2024 08:25 12s
Bump the eslint group with 2 updates Conflicts #7678: Commit d418667 pushed by dependabot bot
September 23, 2024 08:24 13s dependabot/npm_and_yarn/eslint-af87b5999a
dependabot/npm_and_yarn/eslint-af87b5999a
September 23, 2024 08:24 13s
Bump babel-loader from 9.1.3 to 9.2.1 in the babel group Conflicts #7677: Commit 5b49ce6 pushed by dependabot bot
September 23, 2024 08:23 11s dependabot/npm_and_yarn/babel-572c06e39c
dependabot/npm_and_yarn/babel-572c06e39c
September 23, 2024 08:23 11s
Add Playlist Sort By Video Duration Conflicts #7676: Pull request #5627 synchronize by Hoverth
September 21, 2024 04:12 10s
September 21, 2024 04:12 10s
Add Playlist Sort By Video Duration Conflicts #7675: Pull request #5627 synchronize by Hoverth
September 21, 2024 03:56 13s
September 21, 2024 03:56 13s
Make history page remember last query string & search limit Conflicts #7674: Pull request #5192 synchronize by PikachuEXE
September 21, 2024 03:43 13s
September 21, 2024 03:43 13s
Fix video start time handling (#5719) Conflicts #7673: Commit 9ca2c74 pushed by FreeTubeBot
September 21, 2024 03:29 2m 12s development
development
September 21, 2024 03:29 2m 12s
Local API: Handle new shorts node (#5679) Conflicts #7672: Commit fa4886e pushed by FreeTubeBot
September 21, 2024 03:26 2m 15s development
development
September 21, 2024 03:26 2m 15s
Local API: Handle new shorts node Conflicts #7671: Pull request #5679 synchronize by absidue
September 20, 2024 20:48 10s
September 20, 2024 20:48 10s
Update subscription cache when subscribing from the channel page (#5717) Conflicts #7670: Commit 841e301 pushed by FreeTubeBot
September 20, 2024 03:06 2m 17s development
development
September 20, 2024 03:06 2m 17s
Translated using Weblate (English (United Kingdom)) Conflicts #7669: Commit 9f9f3f2 pushed by weblate
September 20, 2024 01:41 2m 13s development
development
September 20, 2024 01:41 2m 13s
Update subscription cache when subscribing from the channel page Conflicts #7668: Pull request #5717 synchronize by absidue
September 19, 2024 17:21 11s
September 19, 2024 17:21 11s
Add Playlist Sort By Video Duration Conflicts #7667: Pull request #5627 synchronize by Hoverth
September 19, 2024 03:31 11s
September 19, 2024 03:31 11s
Implement persistent subscription cache (#5185) Conflicts #7666: Commit ddb495a pushed by FreeTubeBot
September 18, 2024 15:59 2m 18s development
development
September 18, 2024 15:59 2m 18s
Add Playlist Sort By Video Duration Conflicts #7665: Pull request #5627 synchronize by Hoverth
September 18, 2024 12:13 14s
September 18, 2024 12:13 14s
Add Playlist Sort By Video Duration Conflicts #7664: Pull request #5627 synchronize by Hoverth
September 18, 2024 12:01 15s
September 18, 2024 12:01 15s
Add Playlist Sort By Video Duration Conflicts #7663: Pull request #5627 synchronize by Hoverth
September 18, 2024 11:53 10s
September 18, 2024 11:53 10s
Add Playlist Sort By Video Duration Conflicts #7662: Pull request #5627 synchronize by Hoverth
September 18, 2024 11:50 13s
September 18, 2024 11:50 13s
Add Playlist Sort By Video Duration Conflicts #7661: Pull request #5627 synchronize by Hoverth
September 18, 2024 09:51 15s
September 18, 2024 09:51 15s
Translated using Weblate (Belarusian) Conflicts #7660: Commit 51a8a28 pushed by weblate
September 18, 2024 09:09 2m 14s development
development
September 18, 2024 09:09 2m 14s
Bump npm-run-all2 from 6.2.2 to 6.2.3 (#5708) Conflicts #7659: Commit 864a93c pushed by FreeTubeBot
September 17, 2024 22:35 2m 12s development
development
September 17, 2024 22:35 2m 12s
Translated using Weblate (Swedish) Conflicts #7658: Commit 6515d60 pushed by weblate
September 17, 2024 19:09 2m 18s development
development
September 17, 2024 19:09 2m 18s