Commit 70fb7ad4 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge branch 'dev' into dev-merge

parents a2d69c48 898c9431
{ {
"name": "Gargantext", "name": "Gargantext",
"version": "0.0.5.7", "version": "0.0.5.7.3",
"scripts": { "scripts": {
"generate-purs-packages-nix": "./nix/generate-purs-packages.nix", "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
"generate-psc-packages-nix": "./nix/generate-packages-json.bash", "generate-psc-packages-nix": "./nix/generate-packages-json.bash",
......
...@@ -115,7 +115,7 @@ updatePhyloCpt = here.component "updatePhylo" cpt where ...@@ -115,7 +115,7 @@ updatePhyloCpt = here.component "updatePhylo" cpt where
{ proximity: 0.5 { proximity: 0.5
, synchrony: 0.5 , synchrony: 0.5
, quality: 0.5 , quality: 0.5
, exportFilter: 0.5 , exportFilter: 3.0
, timeUnit: Phylo.Year $ Phylo.TimeUnitCriteria , timeUnit: Phylo.Year $ Phylo.TimeUnitCriteria
{ period: 3 { period: 3
, step: 1 , step: 1
......
...@@ -202,7 +202,7 @@ component = R.hooksComponent "configForm" cpt where ...@@ -202,7 +202,7 @@ component = R.hooksComponent "configForm" cpt where
H.div H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ [
H.label {} [ H.text "Export filter" ] H.label {} [ H.text "Minimum branch size" ]
] ]
, ,
H.div H.div
...@@ -216,7 +216,7 @@ component = R.hooksComponent "configForm" cpt where ...@@ -216,7 +216,7 @@ component = R.hooksComponent "configForm" cpt where
H.div H.div
{ className: "form-group__error" } { className: "form-group__error" }
[ [
H.text "Please enter a `Double` value (eg. 0.5)" H.text "Please enter a `Double` value (eg. 3.0)"
] ]
] ]
] ]
...@@ -653,7 +653,7 @@ defaultData = ...@@ -653,7 +653,7 @@ defaultData =
{ proximity : "1.0" { proximity : "1.0"
, synchrony : "1.0" , synchrony : "1.0"
, quality : "1.0" , quality : "1.0"
, exportFilter : "1.0" , exportFilter : "3.0"
, granularity : show Year_ , granularity : show Year_
, period : "1" , period : "1"
, step : "1" , step : "1"
......
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