[NO-TICKET][EMBER-OSF] Release/next interfaces #369
Merged
Conversation
This file contains hidden or 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
* Update models for reviews API * ReviewLog adapter and serializer * Fix log creator model
…Science#3) * Include reviewable when creating review logs * Add title/contributors fields to preprint model * Clean up serializing relationships
…nScience#2) * Rename `review-log` to `action` * plac8 flake8 * Fix test errors
…r's add page (CenterForOpenScience#11) * Apply requested changes * rename * Apply requested changes * Fix * minor change * Apply requested change * Restore comment * Update search link
* Only use SCSS * Use/Upgrade ember-bootstrap * Update EmberCLI * Remove postinstall * Remove i18n hackery
…er-osf into feature/EOSF-915 # Conflicts: # CHANGELOG.md # addon/components/new-osf-navbar/template.hbs # addon/helpers/build-secondary-nav-links.js # addon/styles/addon.scss # addon/utils/load-relationship.js # package.json # yarn.lock
…er-osf into feature/EOSF-915 # Conflicts: # addon/helpers/build-secondary-nav-links.js
* update translation and total-share-results component
…er-osf into feature/EOSF-915 # Conflicts: # package.json # yarn.lock
…er-osf into feature/EOSF-915
…er-osf into feature/EOSF-915 # Conflicts: # yarn.lock
…er-osf into feature/EOSF-915 # Conflicts: # package.json # yarn.lock
…SF-915 [IN-54][Ember-OSF] Update ember-osf to work with reviews and preprints
…terForOpenScience/ember-osf into release/next-interfaces # Conflicts: # package.json # tests/unit/services/current-user-test.js # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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
Merged next-next-interfaces into next-interfaces, fixed merge conflicts. Letting tests run first.