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

Use flag to determine if user is scrolling or tapping Conflicts #897: Commit 1701a05 pushed by MarmadileManteater
March 7, 2024 00:32 11s better-dash-quality-touch
better-dash-quality-touch
March 7, 2024 00:32 11s
Allow scroll on dash quality selector when screen is narrow Conflicts #896: Commit 2aace3b pushed by MarmadileManteater
March 7, 2024 00:20 14s better-dash-quality-touch
better-dash-quality-touch
March 7, 2024 00:20 14s
Add back line break Conflicts #895: Commit 4127cef pushed by MarmadileManteater
March 6, 2024 23:49 12s better-dash-quality-touch
better-dash-quality-touch
March 6, 2024 23:49 12s
De-duplicate code Conflicts #894: Commit c905e17 pushed by MarmadileManteater
March 6, 2024 23:47 14s better-dash-quality-touch
better-dash-quality-touch
March 6, 2024 23:47 14s
Use classList.* methods over manually editing the attributes Conflicts #893: Commit 081e9ff pushed by MarmadileManteater
March 6, 2024 23:46 12s better-dash-quality-touch
better-dash-quality-touch
March 6, 2024 23:46 12s
Hide the dash quality selector on focusout Conflicts #892: Commit c0ce4a3 pushed by MarmadileManteater
March 6, 2024 22:19 13s better-dash-quality-touch
better-dash-quality-touch
March 6, 2024 22:19 13s
Rehide the splash screen on every resume after the first Conflicts #891: Commit ef9dccd pushed by MarmadileManteater
March 5, 2024 15:57 2m 15s development
development
March 5, 2024 15:57 2m 15s
Cancel all notifications every time Conflicts #890: Commit 76a5bc2 pushed by MarmadileManteater
March 5, 2024 13:58 2m 14s development
development
March 5, 2024 13:58 2m 14s
Don't reacquire wake lock in the background during autoplay Conflicts #889: Commit 5628b13 pushed by MarmadileManteater
March 5, 2024 13:34 2m 14s development
development
March 5, 2024 13:34 2m 14s
Merge remote-tracking branch 'upstream/development' into development Conflicts #888: Commit 9a46682 pushed by MarmadileManteater
March 5, 2024 12:40 2m 16s development
development
March 5, 2024 12:40 2m 16s
Release the wake lock when the app is paused Conflicts #887: Commit 0bc5982 pushed by MarmadileManteater
March 5, 2024 12:34 2m 13s development
development
March 5, 2024 12:34 2m 13s
Add a section which displays the current data directory Conflicts #886: Commit 41d040f pushed by MarmadileManteater
March 4, 2024 21:54 2m 16s development
development
March 4, 2024 21:54 2m 16s
Add setting for disabling automatic file copy on directory move Conflicts #885: Commit e5c92ae pushed by MarmadileManteater
March 4, 2024 21:22 2m 15s development
development
March 4, 2024 21:22 2m 15s
Remove mistakenly committed code Conflicts #884: Commit 2ac1f56 pushed by MarmadileManteater
March 4, 2024 20:49 2m 15s development
development
March 4, 2024 20:49 2m 15s
Reindent app manifest Conflicts #883: Commit c985211 pushed by MarmadileManteater
March 4, 2024 19:41 2m 11s development
development
March 4, 2024 19:41 2m 11s
Acquire wakelock when videos are playing Conflicts #882: Commit d5cb978 pushed by MarmadileManteater
March 3, 2024 20:27 2m 12s development
development
March 3, 2024 20:27 2m 12s
Merge remote-tracking branch 'upstream/development' into development Conflicts #881: Commit 061945e pushed by MarmadileManteater
March 3, 2024 12:13 2m 13s development
development
March 3, 2024 12:13 2m 13s
Add blank line back Conflicts #880: Commit b8f3503 pushed by MarmadileManteater
March 3, 2024 12:09 12s split-views-and-published-on-narrow-displays
split-views-and-published-on-narrow-displays
March 3, 2024 12:09 12s
Add blank line Conflicts #879: Commit 4960ec4 pushed by MarmadileManteater
March 3, 2024 12:07 13s split-views-and-published-on-narrow-displays
split-views-and-published-on-narrow-displays
March 3, 2024 12:07 13s
Move usingTouch into the utils store Conflicts #878: Commit 4bb55fc pushed by MarmadileManteater
March 3, 2024 11:32 2m 12s development
development
March 3, 2024 11:32 2m 12s
Small changes to media notifications which should make them more cons… Conflicts #877: Commit 632957d pushed by MarmadileManteater
March 3, 2024 10:22 2m 17s development
development
March 3, 2024 10:22 2m 17s
Switch away from companion object because it doesn't fix anything Conflicts #876: Commit ac75d88 pushed by MarmadileManteater
March 2, 2024 17:32 2m 12s development
development
March 2, 2024 17:32 2m 12s
Fix issue with import not working && fix error on settings view due t… Conflicts #875: Commit 3e05c9a pushed by MarmadileManteater
March 2, 2024 14:39 2m 14s development
development
March 2, 2024 14:39 2m 14s
Split view count and published date into two lines on small displays Conflicts #874: Commit 9b0dfdc pushed by MarmadileManteater
March 2, 2024 00:27 15s split-views-and-published-on-narrow-displays
split-views-and-published-on-narrow-displays
March 2, 2024 00:27 15s
Wrap ft-icon buttons below before they go fully vertical Conflicts #873: Commit ea98439 pushed by MarmadileManteater
March 1, 2024 21:40 14s responsiveness-watch-info
responsiveness-watch-info
March 1, 2024 21:40 14s
ProTip! You can narrow down the results and go further in time using created:<2024-03-01 or the other filters available.