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

Remove overflow-y as it causes the overflow issue Conflicts #847: Commit 83a47cf pushed by MarmadileManteater
February 14, 2024 11:57 14s share-playlist-dropdown-overflow
share-playlist-dropdown-overflow
February 14, 2024 11:57 14s
Add locales-android folder for setting up seperate weblate Conflicts #846: Commit daca482 pushed by MarmadileManteater
February 13, 2024 16:02 14s android
android
February 13, 2024 16:02 14s
Merge remote-tracking branch 'upstream/development' into android Conflicts #845: Commit d4797a5 pushed by MarmadileManteater
February 13, 2024 12:19 11s android
android
February 13, 2024 12:19 11s
Remove redundant CSS Conflicts #844: Commit c34d094 pushed by MarmadileManteater
February 10, 2024 11:04 11s more-consistent-channel-margins
more-consistent-channel-margins
February 10, 2024 11:04 11s
Adjust margins and media queries on Channel view Conflicts #843: Commit 1de64f2 pushed by MarmadileManteater
February 10, 2024 10:56 11s more-consistent-channel-margins
more-consistent-channel-margins
February 10, 2024 10:56 11s
Merge remote-tracking branch 'upstream/development' into android Conflicts #842: Commit c9e17fb pushed by MarmadileManteater
February 9, 2024 17:54 12s android
android
February 9, 2024 17:54 12s
Reuse all media notifications Conflicts #841: Commit 50fa95f pushed by MarmadileManteater
February 9, 2024 14:41 14s android
android
February 9, 2024 14:41 14s
Hang icon dropdowns to left on watch-video-info on mobile Conflicts #840: Commit f472b90 pushed by MarmadileManteater
February 9, 2024 12:54 13s hang-left
hang-left
February 9, 2024 12:54 13s
Fix intent issues related to supported links Conflicts #839: Commit 1f14e66 pushed by MarmadileManteater
February 8, 2024 21:11 15s android
android
February 8, 2024 21:11 15s
Make external links open in external browser Conflicts #838: Commit 920906b pushed by MarmadileManteater
February 5, 2024 21:05 13s android
android
February 5, 2024 21:05 13s
Made the check for incorrectly typed opml more strict and clear Conflicts #837: Commit 9fd04d2 pushed by MarmadileManteater
February 5, 2024 19:04 13s android
android
February 5, 2024 19:04 13s
Add support for importing subscriptions, playlists, & history Conflicts #836: Commit 7a91081 pushed by MarmadileManteater
February 5, 2024 18:49 14s android
android
February 5, 2024 18:49 14s
Add ability to export subscriptions, playlists, history Conflicts #835: Commit 929010f pushed by MarmadileManteater
February 5, 2024 16:03 13s android
android
February 5, 2024 16:03 13s
Don't readily cancel existing media notifications Conflicts #834: Commit ff278ca pushed by MarmadileManteater
February 4, 2024 22:24 13s android
android
February 4, 2024 22:24 13s
Call cancelMediaNotification instead of manually cancelling Conflicts #833: Commit 7773e1d pushed by MarmadileManteater
February 4, 2024 20:45 13s android
android
February 4, 2024 20:45 13s
Add cancelMediaNotification function which is called on app close o… Conflicts #832: Commit 3669a05 pushed by MarmadileManteater
February 4, 2024 18:09 10s android
android
February 4, 2024 18:09 10s
Update buildAndroid.yml Conflicts #831: Commit 599bdb2 pushed by MarmadileManteater
February 3, 2024 20:05 10s android
android
February 3, 2024 20:05 10s
Update buildAndroid.yml Conflicts #830: Commit 2409ee5 pushed by MarmadileManteater
February 3, 2024 20:03 13s android
android
February 3, 2024 20:03 13s
Fix sed commands Conflicts #829: Commit 8366706 pushed by MarmadileManteater
February 3, 2024 19:51 12s android
android
February 3, 2024 19:51 12s
Add environment to workflow to get access to secrets Conflicts #828: Commit be1331a pushed by MarmadileManteater
February 3, 2024 19:49 12s android
android
February 3, 2024 19:49 12s
Inject signing config into build.gradle Conflicts #827: Commit 02aa2a7 pushed by MarmadileManteater
February 3, 2024 19:46 15s android
android
February 3, 2024 19:46 15s
sed the name in the resources file as well Conflicts #826: Commit 5a49c76 pushed by MarmadileManteater
February 3, 2024 19:33 9s android
android
February 3, 2024 19:33 9s
Update buildAndroid.yml Conflicts #825: Commit fc6d8e4 pushed by MarmadileManteater
February 3, 2024 19:23 9s android
android
February 3, 2024 19:23 9s
Manually set product name Conflicts #824: Commit 3035137 pushed by MarmadileManteater
February 3, 2024 19:22 13s android
android
February 3, 2024 19:22 13s
Change order of operations to read package.json after setting the fields Conflicts #823: Commit b31b32c pushed by MarmadileManteater
February 3, 2024 19:20 11s android
android
February 3, 2024 19:20 11s
ProTip! You can narrow down the results and go further in time using created:<2024-02-03 or the other filters available.