Merge pull request #539 from chgibb/beta-staging

451
chgibb · Jul 23, 2017 · 4713b83 · 4713b83
2 parents b86fda2 + 285ca2e
commit 4713b83
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 196 deletions.
diff --git a/docs/_config.yml b/docs/_config.yml
diff --git a/docs/allReleases.md b/docs/allReleases.md
diff --git a/docs/docs/betaChangeLog.md b/docs/docs/betaChangeLog.md
diff --git a/docs/docs/latest/home.md b/docs/docs/latest/home.md
diff --git a/docs/docs/latest/howToGetPHAT.md b/docs/docs/latest/howToGetPHAT.md
diff --git a/docs/docs/stableChangeLog.md b/docs/docs/stableChangeLog.md
diff --git a/docs/index.md b/docs/index.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phat",
-  "version": "0.0.50-beta.4",
+  "version": "0.0.51-beta.1",
   "description": "Pathogen Host Analysis Tool",
   "main": "main.js",
   "scripts": {

diff --git a/releaseTemplate.md b/releaseTemplate.md
diff --git a/scripts/appendToAllReleases.js b/scripts/appendToAllReleases.js
diff --git a/scripts/cutRelease.js b/scripts/cutRelease.js
diff --git a/scripts/deploy.js b/scripts/deploy.js
diff --git a/scripts/generateDownloadTemplate.js b/scripts/generateDownloadTemplate.js
diff --git a/scripts/generateReleaseDocsFromLatest.js b/scripts/generateReleaseDocsFromLatest.js
diff --git a/src/guiTests/req/projectSelection/openFirstProject.ts b/src/guiTests/req/projectSelection/openFirstProject.ts
@@ -18,7 +18,9 @@ export async function openFirstProject() : Promise<void>
                     }
                 }
             `);
-            resolve();
+            setTimeout(function(){
+                resolve();
+            },5000);
         },5000);
     });
 }
diff --git a/src/req/renderer/inputRenderer/inputBrowseDialog.ts b/src/req/renderer/inputRenderer/inputBrowseDialog.ts
@@ -10,10 +10,15 @@ let fastqExtensions = [
     "fastq",
     "fq"
 ];
+
 let fastaExtensions = [
     "fasta",
-    "fa"
-]
+    "fas",
+    "fa",
+    "seq",
+    "fsa",
+    "fna"
+];
 
 export function inputBrowseDialog() : void
 {
@@ -71,6 +76,5 @@ export function inputBrowseDialog() : void
                 }
             }
         }
-
     );
 }