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

Fix return from PIN reset to index.html #12

Merged
merged 3 commits into from
Jan 12, 2019
Merged

Fix return from PIN reset to index.html #12

merged 3 commits into from
Jan 12, 2019

Conversation

grafixeyehero
Copy link
Member

@grafixeyehero grafixeyehero commented Jan 10, 2019 •
edited by joshuaboniface
Loading

Correct the return callback from forgotpasswordpin.js to return to index.html rather than login.html.

Fixes #531

@grafixeyehero
fix return page
9254448 
fix return page to index.html #11
@grafixeyehero grafixeyehero mentioned this pull request Jan 10, 2019
Closed
@joshuaboniface joshuaboniface changed the title fix return page to index.html #11 Fix return from PIN reset to index.html Jan 11, 2019
@joshuaboniface
Copy link
Member

@grafixeyehero Thanks for your first PR! I've updated the description, are you able to confirm if that is correct?

@JustAMan JustAMan changed the base branch from master to dev January 11, 2019 13:57
JustAMan
JustAMan approved these changes Jan 11, 2019
View reviewed changes
Copy link
Contributor

@JustAMan JustAMan left a comment

Choose a reason for hiding this comment

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

LGTM!
Don't forget to add yourself to CONTRIBUTORS.md.

@JustAMan
Copy link
Contributor

@grafixeyehero I've fixed merge conflicts for you, I hope you don't object :)

@joshuaboniface joshuaboniface merged commit d2c6840 into jellyfin:dev Jan 12, 2019
@grafixeyehero grafixeyehero deleted the master branch January 12, 2019 13:03
@joshuaboniface joshuaboniface mentioned this pull request Jan 21, 2019
Merged
@grafixeyehero grafixeyehero mentioned this pull request Jan 22, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JustAMan JustAMan JustAMan approved these changes

@joshuaboniface joshuaboniface joshuaboniface 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
@grafixeyehero @joshuaboniface @JustAMan