diff --git a/.gitignore b/.gitignore index 16ecd65e1..0a7848506 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,13 @@ coverage/ shell/bin/linux shell/bin/darwin shell/bin/win32 + +shell/scripts/bin +shell/scripts/build + +dist/darwin +dist/linux +dist/windows +dist/*.dmg +dist/*.tar.gz +dist/*.exe diff --git a/README.md b/README.md index 1ec1f5809..b7ddb314a 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,19 @@ Once this script has completed, you can launch the shell-based Copay by running: npm run shell ``` +## Building Native Shell Binaries/Installers (OSX) + +``` +npm run dist +``` + +This script will download atom shell binaries and combine them with Copay sources +to build a DMG for osx-x64, an installer EXE for win32, and a .tar.gz for linux-x64. +It was developed to be run on OSX. The outputs are copied to the dist directory. + +DMG is created with hdiutil +EXE is created with makensis (brew install makensis) + ## Tests Open test/index.html in your browser to test the models. Install and run karma diff --git a/bower.json b/bower.json index 8004861c5..068b61a46 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,7 @@ "sjcl": "1.0.0", "file-saver": "*", "qrcode-decoder-js": "*", - "bitcore": "0.1.24", + "bitcore": "0.1.25", "angular-moment": "~0.7.1", "socket.io-client": ">=1.0.0", "mousetrap": "1.4.6" diff --git a/css/main.css b/css/main.css index ef96e3dc6..c1bf699b6 100644 --- a/css/main.css +++ b/css/main.css @@ -197,9 +197,9 @@ span.panel-res { } .line-dashed { - border-top: 2px dashed #ccc; + border-top: 1px dashed #ccc; margin: 1rem 0; - padding: 1rem 0; + /* padding: 1rem 0; */ } @@ -271,7 +271,7 @@ hr { margin: 2.25rem 0;} .p70l {padding-left: 70px;} .p5h {padding: 0 5px;} .p20h {padding: 0 20px;} -.m30v {margin: 30px 0;} +.m30v {/* margin: 30px 0; */} .m10h {margin:0 10px;} .m30a {margin: 30px auto;} .br100 {border-radius: 100%;} @@ -286,6 +286,11 @@ hr { margin: 2.25rem 0;} display: inline; float: right; } + +.setup .video-small { + float: none !important; +} + .online { background-color: black; border: 3px solid #1ABC9C; diff --git a/dist/README.md b/dist/README.md new file mode 100644 index 000000000..1d883f95d --- /dev/null +++ b/dist/README.md @@ -0,0 +1 @@ +This is the destination directory for the built atom-shell binaries and the files used to create them \ No newline at end of file diff --git a/index.html b/index.html index 40bb5f18c..c98c59fb6 100644 --- a/index.html +++ b/index.html @@ -82,31 +82,10 @@
-
-
-
- - Not all copayers have joined your wallet yet. - - {{$root.wallet.publicKeyRing.totalCopayers - $root.wallet.publicKeyRing.registeredCopayers() }} people have - - - One person has - - yet to join. -
-
- - All copayers have joined the wallet, it's ready for use! -
-
-
-

Share this secret with your other copayers - for them to join your wallet

@@ -122,25 +101,63 @@
-
+
- +
People on this wallet
- +
+ + + + you + + + {{c.nick}} + [SIN: {{c.peerId}}] + +
+ +
+ + Waiting for other copayers to join +
+
+
+ + +
@@ -156,10 +173,20 @@