Pre-release tasks

cggh · Mar 23, 2017 · f13a8d6 · f13a8d6
1 parent 47e757c
commit f13a8d6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 296 deletions.
diff --git a/documentation/importdata/importsettings/datatable.rst b/documentation/importdata/importsettings/datatable.rst
@@ -31,6 +31,9 @@ icon
   *Text.* Specifies an icon that will be associated with the data table.
   The icon name can be chosen from the list specified in http://fortawesome.github.io/Font-Awesome/icons/.
 
+hdfPath
+  *Text.* If the data source is HDF5 then this can be used to specify the path within the HDF5 file to the arrays.
+
 isHidden
   *Boolean.* If set to true, the data table will not be displayed as a standalone entity
   (i.e. not mentioned on the intro page and no tab).

diff --git a/documentation/importdata/importsettings/twoddatatable.rst b/documentation/importdata/importsettings/twoddatatable.rst
@@ -32,7 +32,7 @@ columnDataTable
 
 columnIndexField
   *Text (required).* The property ID in the ``columnDataTable`` data table that maps into the ``columnIndexArray``
-  array in the zarr source file. ``columnIndexField`` and ``columnIndexArray`` together establish the link between the column data table values, and the data present in the zarr source file.
+  array in the zarr source dir. ``columnIndexField`` and ``columnIndexArray`` together establish the link between the column data table values, and the data present in the zarr source dir.
   Alternatively ``columnIndexArray`` can be omitted implying that the columns in zarr are in the same order as ``columnIndexField`` sorted.
   Note that "AutoKey" can be used if your rows do not have Unique IDs.
 
@@ -47,7 +47,7 @@ rowDataTable
 
 rowIndexField
   *Text (required).* The property ID in the ``rowDataTable`` data table that maps into ``rowIndexArray``
-  array in the zarr source file. ``rowIndexField`` and ``rowIndexArray`` together establish the link between the row data table values, and the data present in the zarr source dir.
+  array in the zarr source dir. ``rowIndexField`` and ``rowIndexArray`` together establish the link between the row data table values, and the data present in the zarr source dir.
   Alternatively ``rowIndexArray`` can be omitted implying that the rows in zarr are in the same order as ``rowIndexField`` sorted.
   Note that "AutoKey" can be used if your rows do not have Unique IDs.
 

diff --git a/webapp/dist/panoptes/babel.js b/webapp/dist/panoptes/babel.js
diff --git a/webapp/dist/panoptes/index.html b/webapp/dist/panoptes/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>Panoptes</title>
-  <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,700italic' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Roboto:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
   <link rel="apple-touch-icon" sizes="180x180" href="/panoptes/images/favicons/apple-touch-icon.png">
   <link rel="icon" type="image/png" href="/panoptes/images/favicons/favicon-32x32.png" sizes="32x32">
   <link rel="icon" type="image/png" href="/panoptes/images/favicons/favicon-16x16.png" sizes="16x16">
@@ -250,5 +250,5 @@
     <div class="error-text">Loading Panoptes...</div>
   </div>
 </div>
-<script type="text/javascript" src="/panoptes/panoptes.js?590973f3b0bf397a1b40"></script><script type="text/javascript" src="/panoptes/babel.js?590973f3b0bf397a1b40"></script></body>
+<script type="text/javascript" src="/panoptes/panoptes.js?2ce500535c98ba63cef4"></script><script type="text/javascript" src="/panoptes/babel.js?2ce500535c98ba63cef4"></script></body>
 </html>
diff --git a/webapp/dist/panoptes/panoptes.js b/webapp/dist/panoptes/panoptes.js
diff --git a/webapp/dist/panoptes/panoptes.js.map b/webapp/dist/panoptes/panoptes.js.map