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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions conf/Config_template.pm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ $mgrast_metadata_password = '';
# FormWiz
$mgrast_formWizard_templates = $ROOT."/src/MGRAST/Templates";

# Shock/AWE information
$awe_url = '';
$shock_url = '';
$mgrast_inbox_clientgroups = '';
$mgrast_seq_stats_workflow = $ROOT."/src/MGRAST/workflows/seq_stats.awf";

# Analysis DB
$mgrast_db = '';
$mgrast_dbms = '';
Expand Down
1 change: 1 addition & 0 deletions src/MGRAST/html/js/rgbcolor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* @license Use it if you like it
*/

// for bps: A, T, C, G, N, X, total

Copy link
Copy Markdown
Member

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

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my most important change

function bpColors()
{
return ["#109618","#dc3912","#3366cc","#ff9900","#8a4117","#000000","#990099"];
Expand Down
Loading