-
Notifications
You must be signed in to change notification settings - Fork 38
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
[EMB-535][EOSF][Chronos][NPD]Merge NPD changes to Chronos branch. #422
Merged
jamescdavis
merged 23 commits into
CenterForOpenScience:feature/chronos
from
adlius:feature/chronos
Jan 3, 2019
Merged
[EMB-535][EOSF][Chronos][NPD]Merge NPD changes to Chronos branch. #422
jamescdavis
merged 23 commits into
CenterForOpenScience:feature/chronos
from
adlius:feature/chronos
Jan 3, 2019
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
…the Preprint model. - Consolidate contributor-related methods to a ContributorMixin to be shared between the node and preprint models. - Add a preprint relationship to the contributor model - tentatively trying to share this between nodes and preprints? - Update contributor adapter so requests can be made to a preprint or a node.
…tributor. - If a contributor is deleted, and then added, you get a record like "Assertion Failed: 'contributor' was saved to the server, but the response returned the new id 'abcde', which has already been used with another record.'"
…ndpoint to unset the node.
…eprint-divorce [NPD] Add notes
…ode-preprint-divorce Syntax cleanup
…e-preprint-divorce Feature/Node-Preprint Divorce Ember-OSF [IN-98]
…_changelog Feature/NPD Ember-osf Changelog [IN-98]
jamescdavis
previously requested changes
Dec 10, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since #417 has been merged, this should target develop
.
adlius
changed the title
[EOSF][Chronos][NPD]Merge NPD changes to Chronos branch.
[EMB-535][EOSF][Chronos][NPD]Merge NPD changes to Chronos branch.
Dec 21, 2018
jamescdavis
approved these changes
Jan 3, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
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.
Purpose
This PR merges NPD branch into Chronos branch.
Notes for Reviewer
Reviewer Checklist
CHANGELOG.md