Repository navigation
merge of shock code #590
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
Merged
Merged
merge of shock code #590
Changes from all commits
Commits
Show all changes
102 commits
Select commit
Hold shift + click to select a range
f22a80d
Merge pull request #5 from teharrison/develop
teharrison bab2674
Merge pull request #6 from teharrison/develop
teharrison b447074
Merge pull request #7 from teharrison/develop
teharrison 739cd42
remove project dir from project creation
teharrison 5acd54b
remove refrence of job directory in Job module
teharrison 8fd6b45
removed unused function
teharrison f0dae93
changed api file download to use shock
teharrison 91c87d1
update download struct
teharrison ba8f4d3
change inbox view to use shock
teharrison c3ab2d5
update code because shock uses username and not email for ACLs
teharrison d0fd484
inbox update: now upload to shock in 2 steps: 1. POST data stream to …
teharrison cf52470
optimize LWP agent code for shock access
teharrison d1fcaec
changed file download to stream from shock
teharrison bebe058
update mgrast token usage and some bug fixes
de48d3a
fixed return url
0a165cc
use shock to retrieve metagenome statistics
teharrison 959151d
add missing import
8489a77
re-organize shock parts
teharrison 6cfa665
Merge branch 'shock' of github.com:teharrison/MG-RAST into shock
teharrison 213173e
changed Analysis.pm to use shock for sims/sequence lookup
teharrison cebce29
api download of subset index files from shock
teharrison 4b72bfd
fix syntax error
b0f0f80
fix subset file name
563ca2e
api annotation download use shock for index retrieval
teharrison 499db37
fix syntax error
a5fff45
Merge pull request #523 from teharrison/shock
teharrison dd26c1d
consolidate token usage for api
teharrison f4bb893
safely runs with no web memcache
teharrison 98a7343
doesn't break on missing conf variable
teharrison d6037df
Merge pull request #524 from teharrison/shock
teharrison 693c3f0
doesn't break on missing conf variable
teharrison 5de1edb
another missing config variable
teharrison e9b30d8
Merge pull request #529 from teharrison/shock
teharrison 7eab722
resolve conflict with develop branch
237d11d
Merge branch 'shock' of git@github.com:teharrison/MG-RAST into shock
affbb0a
Merge branch 'develop' into shock
teharrison fdb8876
Merge pull request #534 from teharrison/shock
teharrison 10ed965
update to download for subset shock nodes
teharrison 82a8e9b
Merge pull request #10 from teharrison/develop
teharrison 36c71c4
Merge pull request #11 from teharrison/develop
teharrison 2f1fe67
Merge pull request #12 from teharrison/develop
teharrison e5a5353
Merge pull request #13 from teharrison/develop
teharrison 5d363a8
merge from develop
teharrison f93757c
Merge branch 'master' into shock
teharrison 1e219a7
action to add job to project
teharrison c438881
Merge pull request #554 from teharrison/shock
teharrison ee03b02
Merge pull request #15 from teharrison/develop
teharrison 42e33e7
Merge pull request #559 from teharrison/shock
teharrison df6eb79
Merge pull request #16 from teharrison/develop
teharrison 2738574
Merge pull request #566 from teharrison/shock
teharrison 146bbba
Merge pull request #17 from teharrison/develop
teharrison 1d1632f
Merge pull request #568 from teharrison/shock
teharrison bfe0c2f
added submit action to job resource
9ee4c7c
update shock file download to be buffered
afadad4
update return of add_metadata function
0c6f38b
add API calls to import / update metadata, also handle metadata sprea…
04a5368
Merge pull request #569 from teharrison/shock
teharrison 9470027
Added AWE workflow for computing sequence stats on file and pushing t…
jaredbischof ccc9b1c
Added variables needed for Shock and AWE communication.
jaredbischof 66f2950
Added AWE workflow template for performing sequence stats computation…
jaredbischof 3b4b353
Added stats computation as inbox operation thru the API. This is sub…
jaredbischof fcb7e87
Merge pull request #570 from jaredbischof/develop
jaredbischof eedaa2b
option to get info for job reserve and create actions from input file…
218f59b
Merge branch 'shock' of git@github.com:MG-RAST/MG-RAST into shock
14f0299
Merge pull request #571 from teharrison/shock
teharrison 791a3ec
fix stats keyword
20646ab
now check for projects existance through name in metadata
f0099d8
add new awe submission to upload page
b903f67
Merge branch 'shock' of git@github.com:MG-RAST/MG-RAST into shock
ca58c54
Merge pull request #572 from teharrison/shock
teharrison c371970
Merge pull request #18 from teharrison/develop
teharrison 5070f38
upload page, fix bowtie index and filepath
e062d39
Merge pull request #577 from teharrison/shock
teharrison 724de81
start of KBase auto user generation
8ac2284
Merge branch 'shock' of github.com:MG-RAST/MG-RAST into shock
51908a4
fix using wrong id in lookup
teharrison 5940c40
Merge branch 'shock' of github.com:teharrison/MG-RAST into shock
teharrison e955863
Merge branch 'shock' of github.com:MG-RAST/MG-RAST into shock
teharrison 32bbcc9
Merge pull request #578 from teharrison/shock
teharrison 65ccafe
fix qc stats processesing
teharrison 5a8fa5b
Merge pull request #579 from teharrison/shock
teharrison e685da1
fix default return type
teharrison 675bdf8
fix drisee data download
teharrison ba7136d
Merge pull request #580 from teharrison/shock
teharrison b481830
make doenload page work with shock
teharrison e8c26fe
Merge pull request #581 from teharrison/shock
teharrison 60be662
download page bug fixes
teharrison dc5e885
Merge pull request #582 from teharrison/shock
teharrison 32f2d13
fix page layout text
teharrison b178c68
Merge pull request #583 from teharrison/shock
teharrison 740019a
fix page layout text
teharrison 31f1281
Merge pull request #584 from teharrison/shock
teharrison d9451a3
using AWE instead of DB for job progress info
c8d20ba
Merge pull request #585 from paczian/shock
teharrison d248d6f
fix bp chart colors / order
teharrison 5ef8994
Merge pull request #586 from teharrison/shock
teharrison 6ce221f
close link
teharrison fa469ff
Merge pull request #587 from teharrison/shock
teharrison 30869a3
removed depricated modules
teharrison a0c7a2c
Merge branch 'shock' of github.com:MG-RAST/MG-RAST into shock
teharrison b264cc7
public button makes shock nodes public
teharrison a4d0b35
Merge pull request #589 from teharrison/shock
teharrison File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the inline comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my most important change