Skip to content

develop into api#695

Merged
teharrison merged 67 commits into
apifrom
develop
Mar 16, 2015
Merged

develop into api#695
teharrison merged 67 commits into
apifrom
develop

Conversation

@teharrison
Copy link
Copy Markdown
Collaborator

No description provided.

Tobias Paczian and others added 30 commits February 9, 2015 10:05
added heartbeat resource
Conflicts:
	src/MGRAST/lib/resources/inbox.pm
added impersonation for admins to user resource
added expiration to token
teharrison and others added 28 commits February 19, 2015 14:10
inbox upgrade and token mod
updates to inbox resource and workflows
added cite MG-RAST API button
added heartbeat check for SHOCK and AWE before submission
annotation version in matrix resource
added missing semicolon
fixed syntax error in inbox and missing function in analysis.pm
teharrison added a commit that referenced this pull request Mar 16, 2015
@teharrison teharrison merged commit 031010b into api Mar 16, 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.

2 participants