update develop branch with api branch, got out of synch#732
Merged
teharrison merged 63 commits intoMG-RAST:developMG-RAST/MG-RAST:developfrom Jun 25, 2015
Merged
update develop branch with api branch, got out of synch#732teharrison merged 63 commits intoMG-RAST:developMG-RAST/MG-RAST:developfrom
teharrison merged 63 commits intoMG-RAST:developMG-RAST/MG-RAST:developfrom
Conversation
Edits to make API url's show up correctly in return structures and some fixes to API documentation.
…lls execute at least 30 times faster, and should not break anything
Edits to beta API
See commits.
only add external metadata ref if IDs exist
change solr return filed for ontology lookup
second fix for annotations through solr
merge from develop
fix feature output of annotation resource
See commits.
add resubmit action, fix retrieval of awe id
develop into api
fix inbox workflows and annotation resource
fix syntax error
fix bug in annotation retrieval
inbox bug fixes
update dependencies - again
fix dockerfile
added m5nr download
seperate script for downloading m5nr blast files
restructure docker files to allow multiple
develop->api
teharrison
added a commit
that referenced
this pull request
Jun 25, 2015
update develop branch with api branch, got out of synch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
No description provided.