Commit 30379670 authored by Severine Duvaud's avatar Severine Duvaud
Browse files

Merge branch 'master' of gitlab.isb-sib.ch:ST/ga4gh-arraymap

parents 68db7c41 02503365
File added
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -2,9 +2,9 @@ var object = {
info: { "info": {
"id": "arraymap-beacon",
"name": "Beacon ArrayMap",
"name": "Beacon arrayMap",
"organization": "SIB Swiss Institute of Bioinformatics",
"description": "First Prototype of a Beacon v0.2 implementation for ArrayMap.",
"description": "First Prototype of a Beacon v0.2 implementation for arrayMap.",
"datasets": [
{"id": "9962/3", "description": "Essential thrombocythemia", "reference": "reference genome", "size": { "variants": "-1", "samples": "45"}},
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -2,9 +2,9 @@ var object = {
info: { "info": {
"id": "arraymap-beacon",
"name": "Beacon ArrayMap",
"name": "Beacon arrayMap",
"organization": "SIB Swiss Institute of Bioinformatics",
"description": "First Prototype of a Beacon v0.3 implementation for ArrayMap.",
"description": "First Prototype of a Beacon v0.3 implementation for arrayMap.",
"datasets": [
{"id": "9962/3", "description": "Essential thrombocythemia", "reference": "reference genome", "size": { "variants": "-1", "samples": "45"}},
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -33,7 +33,7 @@ function getDatasets(json) {
var infoinfo = {};
infoinfo.id = "arraymap-beacon";
infoinfo.name = "Beacon ArrayMap";
infoinfo.name = "arrayMap Beacon";
infoinfo.organization = "SIB Swiss Institute of Bioinformatics";
infoinfo.description = "First Prototype of a Beacon v0.4 implementation for arrayMap";
infoinfo.api = "v0.4";
......@@ -65,4 +65,4 @@ function getDatasets(json) {
object.info = info;
return object;
}
\ No newline at end of file
}
File mode changed from 100644 to 100755
......@@ -12,10 +12,11 @@
"debug": "~2.2.0",
"express": "~4.13.1",
"jade": "~1.11.0",
"mongodb": "^2.1.4",
"mongodb": "^2.2.9",
"mongojs": "^2.3.0",
"monk": "^1.0.1",
"morgan": "~1.6.1",
"request": "^2.74.0",
"serve-favicon": "~2.3.0",
"underscore": "^1.8.3",
"request": "^2.74.0",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment