Skip to content

update develop branch with api branch, got out of synch#732

Merged
teharrison merged 63 commits into
MG-RAST:developfrom
teharrison:develop
Jun 25, 2015
Merged

update develop branch with api branch, got out of synch#732
teharrison merged 63 commits into
MG-RAST:developfrom
teharrison:develop

Conversation

@teharrison
Copy link
Copy Markdown
Collaborator

No description provided.

jaredbischof and others added 30 commits August 15, 2013 13:03
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
only add external metadata ref if IDs exist
change solr return filed for ontology lookup
second fix for annotations through solr
fix feature output of annotation resource
add resubmit action, fix retrieval of awe id
fix inbox workflows and annotation resource
fix bug in annotation retrieval
teharrison added a commit that referenced this pull request Jun 25, 2015
update develop branch with api branch, got out of synch
@teharrison teharrison merged commit 51ebbf2 into MG-RAST:develop Jun 25, 2015
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