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.

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

Conversation

adlius
Copy link
Collaborator

@adlius adlius commented Dec 7, 2018

Purpose

This PR merges NPD branch into Chronos branch.

Notes for Reviewer

Reviewer Checklist

  • meets requirements
  • easy to understand
  • DRY
  • testable and includes test(s)
  • changes described in CHANGELOG.md

pattisdr and others added 23 commits September 12, 2018 19:38
…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.'"
…e-preprint-divorce

Feature/Node-Preprint Divorce Ember-OSF [IN-98]
…_changelog

Feature/NPD Ember-osf Changelog [IN-98]
Copy link
Member

@jamescdavis jamescdavis left a 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.

@jamescdavis jamescdavis dismissed their stale review December 10, 2018 20:24

Nevermind, ignore me.

@adlius 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
Copy link
Member

@jamescdavis jamescdavis left a comment

Choose a reason for hiding this comment

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

👍

@jamescdavis jamescdavis merged commit c47e54a into CenterForOpenScience:feature/chronos Jan 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants