Skip to content

Actions: MarmadileManteater/FreeTubeAndroid

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
663 workflow runs
663 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Don't set a playback speed (allow timeupdate to move the progress along) Conflicts #872: Commit 0255c2d pushed by MarmadileManteater
March 1, 2024 21:14 2m 13s development
development
March 1, 2024 21:14 2m 13s
Fix broken link in webmanifest Conflicts #871: Commit ce257a2 pushed by MarmadileManteater
March 1, 2024 20:11 2m 15s development
development
March 1, 2024 20:11 2m 15s
Pause playback when the media notification is dismissed Conflicts #870: Commit 46831d7 pushed by MarmadileManteater
March 1, 2024 08:30 2m 12s development
development
March 1, 2024 08:30 2m 12s
Merge branch 'FreeTubeApp:development' into development Conflicts #869: Commit acfe2b9 pushed by MarmadileManteater
February 29, 2024 16:56 2m 12s development
development
February 29, 2024 16:56 2m 12s
Fix incorrect artifact name Conflicts #868: Commit e1824a3 pushed by MarmadileManteater
February 29, 2024 01:01 2m 11s development
development
February 29, 2024 01:01 2m 11s
Debug artifact not being uploaded Conflicts #867: Commit ffb1844 pushed by MarmadileManteater
February 29, 2024 00:53 2m 12s development
development
February 29, 2024 00:53 2m 12s
Upgrade old node in gh workflow Conflicts #866: Commit 05d2c31 pushed by MarmadileManteater
February 29, 2024 00:46 2m 10s development
development
February 29, 2024 00:46 2m 10s
Gut cordova from the project Conflicts #865: Commit 6aed024 pushed by MarmadileManteater
February 29, 2024 00:42 2m 25s development
development
February 29, 2024 00:42 2m 25s
Add android as an empty external in the web build Conflicts #864: Commit b004fe0 pushed by MarmadileManteater
February 28, 2024 22:54 12s android
android
February 28, 2024 22:54 12s
Wait to hide splashscreen until javascript loads Conflicts #863: Commit a06c828 pushed by MarmadileManteater
February 28, 2024 20:59 13s android
android
February 28, 2024 20:59 13s
Minor css tweak for About view Conflicts #862: Commit 53ad4cb pushed by MarmadileManteater
February 28, 2024 20:49 19s android
android
February 28, 2024 20:49 19s
Cherry pick the about info && updates from the old cordova build Conflicts #861: Commit 049e0ce pushed by MarmadileManteater
February 28, 2024 20:49 10s android
android
February 28, 2024 20:49 10s
Add || process.env.IS_ANDROID to all local api IS_ELECTRON checks Conflicts #860: Commit 180349a pushed by MarmadileManteater
February 28, 2024 20:39 10s android
android
February 28, 2024 20:39 10s
Merge remote-tracking branch 'upstream/development' into android Conflicts #859: Commit 4e70c77 pushed by MarmadileManteater
February 28, 2024 20:23 11s android
android
February 28, 2024 20:23 11s
Remove all permissions not named explicitly Conflicts #858: Commit bb466dd pushed by MarmadileManteater
February 25, 2024 00:15 2m 15s development
development
February 25, 2024 00:15 2m 15s
Remove all permissions not named explicitly Conflicts #857: Commit 253935b pushed by MarmadileManteater
February 25, 2024 00:15 2m 14s development
development
February 25, 2024 00:15 2m 14s
**Release 110** Conflicts #856: Commit a003d4b pushed by MarmadileManteater
February 24, 2024 03:16 10s 0.19.2.110
0.19.2.110
February 24, 2024 03:16 10s
**Release 110** Conflicts #855: Commit a003d4b pushed by MarmadileManteater
February 24, 2024 03:02 9s release
release
February 24, 2024 03:02 9s
bump version number Conflicts #854: Commit 79030b4 pushed by MarmadileManteater
February 24, 2024 02:55 2m 14s development
development
February 24, 2024 02:55 2m 14s
Update yarn lock Conflicts #853: Commit 28803d1 pushed by MarmadileManteater
February 24, 2024 02:45 2m 12s development
development
February 24, 2024 02:45 2m 12s
Merge branch 'development' of https://github.com/MarmadileManteater/F… Conflicts #852: Commit e517085 pushed by MarmadileManteater
February 23, 2024 23:40 2m 17s development
development
February 23, 2024 23:40 2m 17s
Merge remote-tracking branch 'upstream/development' into android Conflicts #851: Commit e8b6ed4 pushed by MarmadileManteater
February 23, 2024 21:23 12s android
android
February 23, 2024 21:23 12s
Merge branch 'FreeTubeApp:development' into android Conflicts #850: Commit 8171a59 pushed by MarmadileManteater
February 15, 2024 15:21 11s android
android
February 15, 2024 15:21 11s
Hide channel sidebar label under more when setting is enabled Conflicts #849: Commit 230acc6 pushed by MarmadileManteater
February 14, 2024 16:06 12s hide-channel-label-with-setting-on-mobile
hide-channel-label-with-setting-on-mobile
February 14, 2024 16:06 12s
Remove unnecessary whitespace Conflicts #848: Commit 9bf451c pushed by MarmadileManteater
February 14, 2024 11:58 13s share-playlist-dropdown-overflow
share-playlist-dropdown-overflow
February 14, 2024 11:58 13s
ProTip! You can narrow down the results and go further in time using created:<2024-02-14 or the other filters available.