Commit 6c131a51 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into dev-bootstrap-v4-upgrade

parents 45187e9a 7b35504a
...@@ -55,15 +55,15 @@ instance showNodeAction :: Show NodeAction where ...@@ -55,15 +55,15 @@ instance showNodeAction :: Show NodeAction where
show Download = "Download" show Download = "Download"
show Upload = "Upload" show Upload = "Upload"
show Refresh = "Refresh" show Refresh = "Refresh"
show (Move t) = "Move with subtree params" <> show t show (Move t) = "Move with subtree params" -- <> show t
show Clone = "Clone" show Clone = "Clone"
show Delete = "Delete" show Delete = "Delete"
show Share = "Share" show Share = "Share"
show Config = "Config" show Config = "Config"
show (Link x) = "Link to " <> show x show (Link x) = "Link to " -- <> show x
show (Add xs) = foldl (\a b -> a <> show b) "Add " xs show (Add xs) = "Add Child" -- foldl (\a b -> a <> show b) "Add " xs
show (Merge t) = "Merge with subtree" <> show t show (Merge t) = "Merge with subtree" -- <> show t
show (Publish x) = "Publish" <> show x show (Publish x) = "Publish" -- <> show x
show AddingContact = "AddingContact" show AddingContact = "AddingContact"
show CloseNodePopover = "CloseNodePopover" show CloseNodePopover = "CloseNodePopover"
...@@ -175,18 +175,18 @@ settingsBox Corpus = ...@@ -175,18 +175,18 @@ settingsBox Corpus =
SettingsBox { show : true SettingsBox { show : true
, edit : true , edit : true
, doc : Documentation Corpus , doc : Documentation Corpus
, buttons : [ Add [ NodeList , buttons : [ Upload
, SearchBox
, Download
--, Clone
, Add [ NodeList
, Graph , Graph
, Dashboard , Dashboard
, NodeFrameWrite , NodeFrameWrite
, NodeFrameCalc , NodeFrameCalc
] ]
, SearchBox
, Upload
, Download
, Move moveParameters
--, Clone
, Link (linkParams Annuaire) , Link (linkParams Annuaire)
, Move moveParameters
, Delete , Delete
] ]
} }
......
...@@ -15,5 +15,6 @@ hasStatus _ (Merge _) = Dev ...@@ -15,5 +15,6 @@ hasStatus _ (Merge _) = Dev
hasStatus _ (Documentation _) = Dev hasStatus _ (Documentation _) = Dev
hasStatus Annuaire Upload = Dev hasStatus Annuaire Upload = Dev
hasStatus Texts Upload = Dev hasStatus Texts Upload = Dev
hasStatus Corpus (Add _) = Dev
hasStatus _ _ = Stable hasStatus _ _ = Stable
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