-
-
Notifications
You must be signed in to change notification settings - Fork 147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bug watch button resume point #1823
Closed
kyleslokafrey
wants to merge
364
commits into
jellyfin:2.0.z
from
kyleslokafrey:bug-watch-button-resume-point
Closed
Bug watch button resume point #1823
kyleslokafrey
wants to merge
364
commits into
jellyfin:2.0.z
from
kyleslokafrey:bug-watch-button-resume-point
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add audio track selection to video player OSD
Update dependency rooibos-roku to v5.10.0
Update dependency @rokucommunity/bslint to v0.8.16
Update dependency markdownlint-cli2 to v0.12.1
…ct-digest Update actions/upload-artifact digest to 26f96df
…ter-1.x Update dependency brighterscript-formatter to v1.6.39
Remove unused function GetSubtitleLanguages in LoadVideoContentTask.bs
Display ending episode number for multi-part TV episodes
Currently translated at 20.5% (57 of 277 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/es_419/
Currently translated at 26.3% (73 of 277 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/hu/
Add scrub function to audio trickplay bar
Update dependency @rokucommunity/bslint to v0.8.17
…ter-1.x Update dependency brighterscript-formatter to v1.6.40
Currently translated at 96.0% (266 of 277 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/it/
Currently translated at 99.6% (279 of 280 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/it/
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Currently translated at 100.0% (280 of 280 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/cs/
Currently translated at 73.5% (206 of 280 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/es/
Currently translated at 75.3% (211 of 280 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/es/
Currently translated at 81.7% (229 of 280 strings) Translation: Jellyfin/Jellyfin Roku Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-roku/es/
…gest Update actions/setup-node digest to 1e60f62
Update dependency rimraf to v6
…ct-digest Update actions/upload-artifact digest to 0b2256b
…-3.0.3 Bump braces from 3.0.2 to 3.0.3
Update dependency brighterscript to v0.67.3
Update actions/checkout digest to 692973e
This pull request has merge conflicts. Please resolve the conflicts so the PR can be reviewed. Thanks! |
It looks like this is still the code checked out from master but now pointed at the 2.0.z branch. You'll need to checkout the 2.0.z branch and reapply your code changes, and then make a PR from the 2.0.z code. Feel free to ping me here or on matrix if you want help |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Update SetMarkedWatch function to set item resume point / playback position to 0
Issues
#1750