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

Capita prism #1090

Merged
merged 2 commits into from Aug 8, 2016

Conversation

Projects
None yet
3 participants
@zuphilip
Collaborator

zuphilip commented Jul 2, 2016

This supersedes PR #963 and should address all remaining issues there.

philjohn and others added some commits Oct 21, 2015

Renamed Talis Prism 2 to Capita Prism
Talis's library business was sold to Capita in 2011, so changing the label to reflect this.

The URI structure being looked for is also from the version of Prism that followed 2, which doesn't have a version number.
@adam3smith

This comment has been minimized.

Show comment
Hide comment
@adam3smith

adam3smith Aug 8, 2016

Collaborator

@zuphilip -- which command(s) do you use to generate these PRs based on other PRs?

Collaborator

adam3smith commented Aug 8, 2016

@zuphilip -- which command(s) do you use to generate these PRs based on other PRs?

@adam3smith adam3smith merged commit 3baeefb into zotero:master Aug 8, 2016

@adam3smith

This comment has been minimized.

Show comment
Hide comment
@adam3smith

adam3smith Aug 8, 2016

Collaborator

Great, thanks both!

Collaborator

adam3smith commented Aug 8, 2016

Great, thanks both!

@zuphilip zuphilip deleted the zuphilip:capita-prism branch Aug 8, 2016

@zuphilip

This comment has been minimized.

Show comment
Hide comment
@zuphilip

zuphilip Aug 8, 2016

Collaborator

@adam3smith Here it was something like

git remote add philjohn https://github.com/philjohn/translators.git
git fetch philjohn
git checkout philjohn:patch-1
git checkout -b capita-prims
...[do some changes]...
git add ...
git commit ...
git push ...
Collaborator

zuphilip commented Aug 8, 2016

@adam3smith Here it was something like

git remote add philjohn https://github.com/philjohn/translators.git
git fetch philjohn
git checkout philjohn:patch-1
git checkout -b capita-prims
...[do some changes]...
git add ...
git commit ...
git push ...

zuphilip added a commit to zuphilip/translators that referenced this pull request Mar 28, 2018

Capita prism (#1090)
* Renamed Talis Prism 2 to Capita Prism

Talis's library business was sold to Capita in 2011, so changing the label to reflect this.

The URI structure being looked for is also from the version of Prism that followed 2, which doesn't have a version number.

zuphilip added a commit to zuphilip/translators that referenced this pull request Mar 28, 2018

Capita prism (#1090)
* Renamed Talis Prism 2 to Capita Prism

Talis's library business was sold to Capita in 2011, so changing the label to reflect this.

The URI structure being looked for is also from the version of Prism that followed 2, which doesn't have a version number.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment