Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Change channel mapper to sort list #364

Merged
merged 2 commits into from
Jun 26, 2019
Merged

Change channel mapper to sort list #364

merged 2 commits into from
Jun 26, 2019

Conversation

petermcneil
Copy link
Contributor

Changes
Channel mapper used to have a randomly sorted list making it difficult to find channels, as XMLTV returns 200+ channels to sort through.

Issues
Fixes jellyfin/jellyfin#1429

dkanada
dkanada approved these changes Jun 18, 2019
View reviewed changes
Copy link
Member

@dkanada dkanada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! You might want to target the release branch since we don't have an exact date for the next major update and this is a small fix for an annoying issue.

@petermcneil petermcneil changed the base branch from master to release-10.3.z June 19, 2019 10:36
@petermcneil petermcneil changed the base branch from release-10.3.z to master June 19, 2019 10:36
@petermcneil petermcneil changed the base branch from master to release-10.3.z June 19, 2019 15:39
@petermcneil petermcneil force-pushed the channelmapper-sorting branch from 187934b to 645df0c Compare June 19, 2019 15:50
@dkanada
Copy link
Member

dkanada commented Jun 21, 2019

You'll have to rebase the commit against the release branch as well in git to avoid the above problem. The easiest way would be to checkout the release branch and cherry pick your commit, then force push to your PR branch.

@petermcneil petermcneil force-pushed the channelmapper-sorting branch from 645df0c to d7180c2 Compare June 23, 2019 15:53
@petermcneil
Copy link
Contributor Author

Okay PR is fixed!

@dkanada dkanada merged commit c9e70d9 into jellyfin:release-10.3.z Jun 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkanada dkanada dkanada approved these changes

@cvium cvium cvium approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@petermcneil @dkanada @cvium