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

Fixed Bookmarks.js HTML character references in title. #1496

Merged
merged 2 commits into from Dec 15, 2017

Conversation

Projects
None yet
3 participants
@ckush
Contributor

ckush commented Dec 12, 2017

Importing bookmarks in Zotero left symbols like & and ' in title. This fix changes them to the original character.

This issue was discussed here: #1485

@zuphilip

This comment has been minimized.

Show comment
Hide comment
@zuphilip

zuphilip Dec 15, 2017

Collaborator

@ckush Okay, that looks fine. But you need to update the lastUpdated-timestamp at the top of this file as well. Otherwise this will not get distributed.

Collaborator

zuphilip commented Dec 15, 2017

@ckush Okay, that looks fine. But you need to update the lastUpdated-timestamp at the top of this file as well. Otherwise this will not get distributed.

@ckush

This comment has been minimized.

Show comment
Hide comment
@ckush

ckush Dec 15, 2017

Contributor

@zuphilip I have updated the timestamp.

Also, I realised I created I new branch patch-1. I don't remember how this happened, as I'm very new to all this. Ideally, was I supposed to keep it to master?

Contributor

ckush commented Dec 15, 2017

@zuphilip I have updated the timestamp.

Also, I realised I created I new branch patch-1. I don't remember how this happened, as I'm very new to all this. Ideally, was I supposed to keep it to master?

@adam3smith

This comment has been minimized.

Show comment
Hide comment
@adam3smith

adam3smith Dec 15, 2017

Collaborator

patch-1 is automatically created when you create forks from github online and it's the recommended way to work so that your local master branch is always "clean"

Collaborator

adam3smith commented Dec 15, 2017

patch-1 is automatically created when you create forks from github online and it's the recommended way to work so that your local master branch is always "clean"

@zuphilip zuphilip merged commit ce38a08 into zotero:master Dec 15, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@zuphilip

This comment has been minimized.

Show comment
Hide comment
@zuphilip

zuphilip Dec 15, 2017

Collaborator

🎉 Thank you @ckush !

Collaborator

zuphilip commented Dec 15, 2017

🎉 Thank you @ckush !

adam3smith added a commit to adam3smith/translators that referenced this pull request Dec 21, 2017

adam3smith added a commit to adam3smith/translators that referenced this pull request Dec 21, 2017

psisquared2 added a commit to psisquared2/translators that referenced this pull request Feb 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment