Merge commit '59bffb804cfd169b777e7fc8c29cb56dd7398c38'

Gene42 · Nov 29, 2016 · ce294c8 · ce294c8
2 parents 12dacc6 + 59bffb8
commit ce294c8
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 28 deletions.
diff --git a/distribution/hsqldb-database/pom.xml b/distribution/hsqldb-database/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid-distribution</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>niaid-database-zip</artifactId>
   <name>PhenoTips for NIAID - HSQLDB Database</name>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotips-niaid-distribution</artifactId>
   <packaging>pom</packaging>

diff --git a/distribution/standalone/pom.xml b/distribution/standalone/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid-distribution</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotips-niaid-standalone</artifactId>
   <name>PhenoTips for NIAID - Standalone Distribution</name>

diff --git a/distribution/ui/pom.xml b/distribution/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid-distribution</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotips-niaid-ui</artifactId>
   <name>PhenoTips for NIAID - Application interface</name>

diff --git a/distribution/war/pom.xml b/distribution/war/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid-distribution</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotips-niaid-war</artifactId>
   <name>PhenoTips for NIAID - War package</name>

diff --git a/encrypted-pii/backend/pom.xml b/encrypted-pii/backend/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>patient-data-encrypted</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-encrypted-backend</artifactId>
   <name>PhenoTips - Encrypted patient name, date of birth and date of death - Backend code</name>

diff --git a/encrypted-pii/pom.xml b/encrypted-pii/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-encrypted</artifactId>
   <name>PhenoTips - Encrypted patient name, date of birth and date of death</name>

diff --git a/encrypted-pii/rest/pom.xml b/encrypted-pii/rest/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>patient-data-encrypted</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-encrypted-rest</artifactId>
   <name>PhenoTips - Encrypted patient name, date of birth and date of death - REST services</name>

diff --git a/encrypted-pii/ui/pom.xml b/encrypted-pii/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>patient-data-encrypted</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-encrypted-ui</artifactId>
   <name>PhenoTips - Encrypted patient name, date of birth and date of death - Frontend code</name>

diff --git a/family-dashboard/api/pom.xml b/family-dashboard/api/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-dashboard</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-dashboard-api</artifactId>
   <name>PhenoTips for NIAID - Family dashboard - Java APIs</name>

diff --git a/family-dashboard/pom.xml b/family-dashboard/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-dashboard</artifactId>
   <name>PhenoTips for NIAID - Family dashboard</name>

diff --git a/family-dashboard/ui/pom.xml b/family-dashboard/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-dashboard</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-dashboard-ui</artifactId>
   <name>PhenoTips for NIAID - Family dashboard - Frontend code</name>

diff --git a/family-data-table/api/pom.xml b/family-data-table/api/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-data-table</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-data-table-api</artifactId>
   <name>PhenoTips - NIAID - Family Data Table API</name>

diff --git a/family-data-table/pom.xml b/family-data-table/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-data-table</artifactId>
   <name>PhenoTips for NIAID - Family Data Table</name>

diff --git a/family-data-table/rest/pom.xml b/family-data-table/rest/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-data-table</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-data-table-rest</artifactId>
   <name>PhenoTips - NIAID - Family Data Table Rest</name>

diff --git a/family-data-table/ui/pom.xml b/family-data-table/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-data-table</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-data-table-ui</artifactId>
   <name>PhenoTips for NIAID - Family Data Table - Frontend code</name>

diff --git a/family-data-table/ui/src/main/resources/PhenoTips/FamilyDataTableTranslations.xml b/family-data-table/ui/src/main/resources/PhenoTips/FamilyDataTableTranslations.xml
@@ -29,6 +29,7 @@
   <hidden>false</hidden>
   <content>family.livetable.doc.name=Family ID
 family.livetable.individuals=# of individuals
+family.livetable.proband_id=Proband ID
 family.livetable.summary=Description
 family.livetable.proband.age=By age
 family.livetable.proband.year_of_birth=By year of birth

diff --git a/family-data-table/ui/src/main/resources/PhenoTips/FamilyFilters.xml b/family-data-table/ui/src/main/resources/PhenoTips/FamilyFilters.xml
@@ -221,7 +221,7 @@
 {{html clean=false}}
    &lt;p class="xHint"&gt;$services.localization.render('phenotips.databaseFilters.owner.hint')&lt;/p&gt;
    &lt;input type="hidden" name="owner/class@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="PhenoTips.OwnerClass"/&gt;
-   &lt;input type="text" class="suggestUsers multipleSelection" name="owner/class@PhenoTips.FamilyClass~PhenoTips.PatientClass" value=""/&gt;
+   &lt;input type="text" class="suggestUsers multipleSelection" name="owner/@PhenoTips.FamilyClass~PhenoTips.PatientClass" value=""/&gt;
 {{/html}}
 * $services.localization.render('phenotips.databaseFilters.author') 
 {{html clean=false}}
@@ -255,7 +255,7 @@
    &lt;input type="hidden" name="gene/match@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="ci"/&gt;
    &lt;input type="hidden" name="status/class@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="PhenoTips.GeneClass"/&gt;
    &lt;input type="hidden" name="status/join_mode@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="OR"/&gt;
-   &lt;input type="hidden" name="status/dependsOn@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="gene"/&gt;{{/html}}
+   &lt;input type="hidden" name="status/dependsOn@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="gene@PhenoTips.FamilyClass~PhenoTips.PatientClass"/&gt;{{/html}}
   ** {{html clean='false'}}$services.localization.render('phenotips.databaseFilters.genotype.statusSelection', ["&lt;label&gt;&lt;input type='checkbox' checked='checked' name='status/@PhenoTips.FamilyClass~PhenoTips.PatientClass' value='candidate'/&gt;", "&lt;/label&gt;", "&lt;label&gt;&lt;input type='checkbox' checked='checked' name='status/@PhenoTips.FamilyClass~PhenoTips.PatientClass' value='solved'/&gt;", "&lt;/label&gt;"]){{/html}}
 {{html clean=false}}
    &lt;input type="hidden" name="identifier/min@PhenoTips.FamilyClass~PhenoTips.PatientClass" value="0"/&gt;

diff --git a/family-groups/api/pom.xml b/family-groups/api/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-groups</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-groups-api</artifactId>
   <name>PhenoTips for NIAID - Family groups - Java APIs</name>

diff --git a/family-groups/pom.xml b/family-groups/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-groups</artifactId>
   <name>PhenoTips for NIAID - Family groups</name>

diff --git a/family-groups/rest/pom.xml b/family-groups/rest/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-groups</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-groups-rest</artifactId>
   <name>PhenoTips for NIAID - Family groups - REST services</name>

diff --git a/family-groups/ui/pom.xml b/family-groups/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>family-groups</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>family-groups-ui</artifactId>
   <name>PhenoTips for NIAID - Family groups - Frontend code</name>

diff --git a/genetic-evaluation/pom.xml b/genetic-evaluation/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-genetic-evaluation</artifactId>
   <packaging>pom</packaging>

diff --git a/genetic-evaluation/ui/pom.xml b/genetic-evaluation/ui/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>patient-data-genetic-evaluation</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>patient-data-genetic-evaluation-ui</artifactId>
   <name>PhenoTips for NIAID - Genetic Evaluation - Site content</name>

diff --git a/phenotype-onset-exact/pom.xml b/phenotype-onset-exact/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotips-niaid</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotype-onset-exact</artifactId>
   <name>PhenoTips for NIAID - Phenotype exact onset</name>

diff --git a/phenotype-onset-exact/ui/pom.xml b/phenotype-onset-exact/ui/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.phenotips</groupId>
     <artifactId>phenotype-onset-exact</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>phenotype-onset-exact-ui</artifactId>
   <name>PhenoTips for NIAID - Phenotype exact onset - Frontend code</name>

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <relativePath />
   </parent>
   <artifactId>phenotips-niaid</artifactId>
-  <version>1.0</version>
+  <version>1.0.1</version>
   <packaging>pom</packaging>
   <name>PhenoTips for NIAID</name>
 
@@ -85,7 +85,7 @@
     <connection>scm:git:git://github.com/Gene42/phenotips-niaid.git</connection>
     <developerConnection>scm:git:git@github.com:Gene42/phenotips-niaid.git</developerConnection>
     <url>https://github.com/Gene42/phenotips-niaid.git/tree/master/</url>
-    <tag>phenotips-niaid-1.0</tag>
+    <tag>phenotips-niaid-1.0.1</tag>
   </scm>
 
   <modules>