Updating UI

genr8r · Jul 14, 2016 · 66f8038 · 66f8038
1 parent 517c705
commit 66f8038
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -21,11 +21,11 @@ serde_json = "0.7.0"
 serde_macros = { version = "0.7.0", optional = true }
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
-parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.3" }
+parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" }
 # List of apps
-parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.1" }
-parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.2" }
-parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6.0", optional = true }
+parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" }
+parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" }
+parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true }
 mime_guess = { version = "1.6.1" }
 clippy = { version = "0.0.79", optional = true}
 

diff --git a/scripts/cov.sh b/scripts/cov.sh
@@ -21,7 +21,7 @@ if ! type $KCOV > /dev/null; then
 fi
 
 . ./scripts/targets.sh
-cargo test $TARGETS --no-default-features --no-run || exit $?
+cargo test $TARGETS --no-run || exit $?
 
 
 

diff --git a/scripts/doc.sh b/scripts/doc.sh
@@ -3,5 +3,5 @@
 
 . ./scripts/targets.sh
 
-cargo doc --no-deps --verbose --no-default-features $TARGETS &&
+cargo doc --no-deps --verbose $TARGETS &&
 	echo '<meta http-equiv=refresh content=0;url=ethcore/index.html>' > target/doc/index.html
diff --git a/scripts/targets.sh b/scripts/targets.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 export TARGETS="
-	-p ethkey \
-	-p ethstore \
+	-p bigint\
 	-p ethash \
-	-p ethcore-util \
 	-p ethcore \
-	-p ethsync \
+	-p ethcore-dapps \
 	-p ethcore-rpc \
 	-p ethcore-signer \
-	-p parity \
-	-p bigint"
-# TODO [ToDr] add ethcore-dapps back
+	-p ethcore-util \
+	-p ethkey \
+	-p ethstore \
+	-p ethsync \
+	-p parity"
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
@@ -18,7 +18,7 @@ env_logger = "0.3"
 ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "stable" }
 ethcore-util = { path = "../util" }
 ethcore-rpc = { path = "../rpc" }
-parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0", optional = true}
+parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true}
 
 clippy = { version = "0.0.79", optional = true}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ if ! type $KCOV > /dev/null; then @@
     fi
     . ./scripts/targets.sh
-    cargo test $TARGETS --no-default-features --no-run || exit $?
+    cargo test $TARGETS --no-run || exit $?
@@ Expand Down @@