Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
imedina committed Jan 14, 2019
2 parents 250557a + 76ffb33 commit 5d28895
Show file tree
Hide file tree
Showing 10 changed files with 751 additions and 4,522 deletions.
2 changes: 1 addition & 1 deletion lib/jsorolla
Submodule jsorolla updated 71 files
+2 −2 package.json
+66 −0 src/core/NotificationUtils.js
+77 −7 src/core/clients/opencga-client.js
+24 −4 src/core/utilsNew.js
+3 −4 src/core/visualisation/pedigree.js
+54 −7 src/core/webcomponents/PolymerUtils.js
+1 −1 src/core/webcomponents/cellbase/variation/cellbase-variantannotation-view.html
+165 −0 src/core/webcomponents/commons/opencb-grid-toolbar.html
+182 −43 src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-browser.html
+981 −0 src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-creator.html
+245 −164 src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-filter.html
+517 −187 src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-grid.html
+331 −0 src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-portal.html
+344 −0 src/core/webcomponents/opencga/catalog/cohorts/opencga-cohort-browser.html
+673 −0 src/core/webcomponents/opencga/catalog/cohorts/opencga-cohort-filter.html
+496 −0 src/core/webcomponents/opencga/catalog/cohorts/opencga-cohort-grid.html
+349 −0 src/core/webcomponents/opencga/catalog/family/opencga-family-browser.html
+421 −0 src/core/webcomponents/opencga/catalog/family/opencga-family-editor.html
+360 −0 src/core/webcomponents/opencga/catalog/family/opencga-family-filter.html
+686 −0 src/core/webcomponents/opencga/catalog/family/opencga-family-grid.html
+293 −0 src/core/webcomponents/opencga/catalog/files/opencga-file-browser.html
+427 −0 src/core/webcomponents/opencga/catalog/files/opencga-file-filter.html
+596 −0 src/core/webcomponents/opencga/catalog/files/opencga-file-grid.html
+0 −381 src/core/webcomponents/opencga/catalog/files/opencga-files-filter.html
+0 −53 src/core/webcomponents/opencga/catalog/files/opencga-files-panel.html
+1 −1 src/core/webcomponents/opencga/catalog/filters/opencga-annotation-filter-widget.html
+345 −0 src/core/webcomponents/opencga/catalog/individual/opencga-individual-browser.html
+462 −0 src/core/webcomponents/opencga/catalog/individual/opencga-individual-filter.html
+735 −0 src/core/webcomponents/opencga/catalog/individual/opencga-individual-grid.html
+456 −0 src/core/webcomponents/opencga/catalog/opencga-date-filter.html
+171 −0 src/core/webcomponents/opencga/catalog/panel/opencga-panel-browser.html
+831 −0 src/core/webcomponents/opencga/catalog/panel/opencga-panel-editor.html
+227 −0 src/core/webcomponents/opencga/catalog/panel/opencga-panel-filter.html
+444 −0 src/core/webcomponents/opencga/catalog/panel/opencga-panel-grid.html
+418 −0 src/core/webcomponents/opencga/catalog/panel/opencga-panel-summary.html
+166 −17 src/core/webcomponents/opencga/catalog/samples/opencga-sample-browser.html
+6 −6 src/core/webcomponents/opencga/catalog/samples/opencga-sample-comparator.html
+240 −603 src/core/webcomponents/opencga/catalog/samples/opencga-sample-filter.html
+204 −348 src/core/webcomponents/opencga/catalog/samples/opencga-sample-grid.html
+247 −0 src/core/webcomponents/opencga/catalog/samples/opencga-sample-view.html
+451 −0 src/core/webcomponents/opencga/catalog/variableSets/opencga-annotation-comparator.html
+392 −0 src/core/webcomponents/opencga/catalog/variableSets/opencga-annotation-filter.html
+461 −0 src/core/webcomponents/opencga/catalog/variableSets/opencga-annotation-viewer.html
+175 −0 src/core/webcomponents/opencga/catalog/variableSets/opencga-variable-selector.html
+491 −267 src/core/webcomponents/opencga/clinical/clinical-analysis-view.html
+2 −2 src/core/webcomponents/opencga/clinical/opencga-variant-clinical.html
+56 −0 src/core/webcomponents/opencga/commons/CatalogUIUtils.js
+504 −0 src/core/webcomponents/opencga/commons/opencga-facet-result-view.html
+252 −0 src/core/webcomponents/opencga/commons/opencga-facet-view-selector.html
+520 −0 src/core/webcomponents/opencga/commons/opencga-facet-view.html
+92 −27 src/core/webcomponents/opencga/opencga-active-filters.html
+0 −606 src/core/webcomponents/opencga/opencga-panel-editor.html
+0 −918 src/core/webcomponents/opencga/opencga-panel-list.html
+0 −108 src/core/webcomponents/opencga/opencga-panel.html
+3 −3 src/core/webcomponents/opencga/panels_example.js
+412 −0 src/core/webcomponents/opencga/variant/VariantGridFormatter.js
+1,070 −0 src/core/webcomponents/opencga/variant/opencga-interpreted-variant-grid.html
+164 −146 src/core/webcomponents/opencga/variant/opencga-variant-browser.html
+34 −22 src/core/webcomponents/opencga/variant/opencga-variant-cohort-stats.html
+134 −0 src/core/webcomponents/opencga/variant/opencga-variant-detail-template.html
+1,138 −792 src/core/webcomponents/opencga/variant/opencga-variant-facet.html
+148 −0 src/core/webcomponents/opencga/variant/opencga-variant-file-metrics.html
+687 −0 src/core/webcomponents/opencga/variant/opencga-variant-filter-clinical.html
+732 −0 src/core/webcomponents/opencga/variant/opencga-variant-filter-sample.html
+589 −427 src/core/webcomponents/opencga/variant/opencga-variant-filter.html
+444 −574 src/core/webcomponents/opencga/variant/opencga-variant-grid.html
+478 −416 src/core/webcomponents/opencga/variant/opencga-variant-interpretation.html
+506 −0 src/core/webcomponents/opencga/variant/opencga-variant-samples.html
+42 −29 src/core/webcomponents/opencga/variant/variant-beacon-network.html
+29 −23 src/core/webcomponents/opencga/variant/variant-beacon.html
+1 −1 src/core/webcomponents/opencga/variant/variant-utils.js
Loading

0 comments on commit 5d28895

Please sign in to comment.