anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3693 from bitpay/v1.6

Browse source 
Updates master from v1.6
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-17 12:32:44 -03:00
commit 08a15ae52b
13 changed files with 55 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cordova/config.xml
View file

@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.bitpay.copay" <widget id="com.bitpay.copay"
version="1.6.1" version="1.6.3"
android-versionCode="59" android-versionCode="61"
ios-CFBundleVersion="1.6.1"> ios-CFBundleVersion="1.6.3">
<name>Copay</name> <name>Copay</name>
<description> <description>
A secure bitcoin wallet for friends and companies. A secure bitcoin wallet for friends and companies.

4
cordova/ios/Copay-Info.plist
View file

@ -57,11 +57,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.6.1</string> <string>1.6.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.6.1</string> <string>1.6.3</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>

2
cordova/wp/Package.appxmanifest
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"> <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
<Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.6.1.0" /> <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.6.3.0" />
<mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" /> <mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
<Properties> <Properties>
<DisplayName>Copay Bitcoin Wallet</DisplayName> <DisplayName>Copay Bitcoin Wallet</DisplayName>

2
cordova/wp/Properties/WMAppManifest.xml
View file

@ -8,7 +8,7 @@
<Language code="ja" /> <Language code="ja" />
<Language code="es" /> <Language code="es" />
</Languages> </Languages>
<App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.6.1.0" xmlns="" NotificationService="MPN"> <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.6.3.0" xmlns="" NotificationService="MPN">
<IconPath IsRelative="true" IsResource="false">Assets\icon@2.png</IconPath> <IconPath IsRelative="true" IsResource="false">Assets\icon@2.png</IconPath>
<Capabilities> <Capabilities>
<Capability Name="ID_CAP_WEBBROWSERCOMPONENT" /> <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />

2
package.json
View file

@ -2,7 +2,7 @@
"name": "copay", "name": "copay",
"description": "A multisignature wallet", "description": "A multisignature wallet",
"author": "BitPay", "author": "BitPay",
"version": "1.6.1", "version": "1.6.3",
"keywords": [ "keywords": [
"wallet", "wallet",
"copay", "copay",

21
public/views/disclaimer.html
View file

@ -1,24 +1,19 @@
<div class="splash content text-center" <div class="splash extra-padding-bottom p20t content text-center"
ng-controller="disclaimerController as disclaimer" ng-init="disclaimer.init()"> ng-controller="disclaimerController as disclaimer" ng-init="disclaimer.init()">
<div class="row"> <div class="row">
<div class="container-image large-2 medium-2 small-2 medium-centered small-centered large-centered columns"> <div class="medium-centered small-centered large-centered columns size-14">
<img src="img/icon-splash.png" alt="icon" width="100%"> <span class="text-bold text-white" translate>WELCOME TO COPAY</span>
</div> <p class="text-gray m0 text-light" translate>A multisignature bitcoin wallet</p>
<div class="row">
<div class="medium-centered small-centered large-centered columns">
<span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
<p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="scrollArea"> <div class="scrollArea">
<p class="enable_text_select m0"> <p class="enable_text_select m0">
<div class="size-16 text-gray" translate>Terms of Use</div> <div class="size-14 text-gray" translate>Terms of Use</div>
<div ng-include="'views/includes/terms.html'"></div> <div ng-include="'views/includes/terms.html'"></div>
</p> </p>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<p ng-show="disclaimer.lang != 'en'"> <p ng-show="disclaimer.lang != 'en'">
@ -26,7 +21,7 @@
</p> </p>
</div> </div>
<div> <div>
<p class="text-gray columns" translate>I affirm that I have read, understood, and agree with these terms.</p> <p class="text-gray columns size-12" translate>I affirm that I have read, understood, and agree with these terms.</p>
</div> </div>
<div class="row"> <div class="row">
@ -42,8 +37,8 @@
<span translate>Creating Wallet...</span> <span translate>Creating Wallet...</span>
</div> </div>
</div> </div>
<div class="start-button columns"> <div class="start-button columns button-box">
<button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing" translate> <button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing m0" translate>
I AGREE. GET STARTED I AGREE. GET STARTED
</button> </button>
</div> </div>

19
src/css/main.css
View file

@ -396,16 +396,23 @@ ul.tx-copayers {
border-bottom: none; border-bottom: none;
} }
.backup .button-box { .button-box {
background: #F1F3F5;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
padding: 0.5rem 1rem 1rem; padding: 0.8rem;
z-index: 9999; z-index: 9999;
} }
.backup .button-box {
background: #F6F7F9;
}
.splash .button-box {
background: #2C3E50;
}
.backup input[type="text"] { .backup input[type="text"] {
border-bottom: 1px solid #CAD4DB; border-bottom: 1px solid #CAD4DB;
} }
@ -1223,7 +1230,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
background: #213140; background: #213140;
border: 1px solid #4B6178; border: 1px solid #4B6178;
border-radius: 5px; border-radius: 5px;
margin: 1.6rem; margin: 1rem;
color: #A5B2BF; color: #A5B2BF;
line-height: 30px; line-height: 30px;
padding: 0.5rem; padding: 0.5rem;
@ -1231,8 +1238,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.scrollArea ul { .scrollArea ul {
font-size: 0.8rem; font-size: 0.8rem;
text-align: justify; text-align: left;
margin-left: 0; margin-left: 0;
line-height: 1.4;
margin-bottom: 0;
} }
.scrollArea li { .scrollArea li {

2
src/js/controllers/disclaimer.js
View file

@ -2,7 +2,7 @@
angular.module('copayApp.controllers').controller('disclaimerController', angular.module('copayApp.controllers').controller('disclaimerController',
function($scope, $timeout, $log, profileService, isCordova, storageService, applicationService, gettextCatalog, uxLanguage, go) { function($scope, $timeout, $log, profileService, isCordova, storageService, applicationService, gettextCatalog, uxLanguage, go) {
self = this; var self = this;
self.tries = 0; self.tries = 0;
var create = function(noWallet) { var create = function(noWallet) {

19
src/js/controllers/index.js
View file

@ -495,6 +495,25 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.pendingTxProposalsCountForUs = 0; self.pendingTxProposalsCountForUs = 0;
var now = Math.floor(Date.now() / 1000); var now = Math.floor(Date.now() / 1000);
/* Uncomment to test multiple outputs */
/*
var txp = {
message: 'test multi-output',
fee: 1000,
createdOn: new Date() / 1000,
outputs: []
};
function addOutput(n) {
txp.outputs.push({
amount: 600,
toAddress: '2N8bhEwbKtMvR2jqMRcTCQqzHP6zXGToXcK',
message: 'output #' + (Number(n) + 1)
});
};
lodash.times(150, addOutput);
txps.push(txp);
*/
lodash.each(txps, function(tx) { lodash.each(txps, function(tx) {
tx = txFormatService.processTx(tx); tx = txFormatService.processTx(tx);

2
src/js/controllers/paperWallet.js
View file

@ -1,6 +1,6 @@
angular.module('copayApp.controllers').controller('paperWalletController', angular.module('copayApp.controllers').controller('paperWalletController',
function($scope, $http, $timeout, $log, configService, profileService, go, addressService, txStatus, bitcore) { function($scope, $http, $timeout, $log, configService, profileService, go, addressService, txStatus, bitcore) {
self = this; var self = this;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var rawTx; var rawTx;

5
src/js/services/txFormatService.js
View file

@ -24,10 +24,9 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
root.processTx = function(tx) { root.processTx = function(tx) {
if (!tx) return; if (!tx) return;
var outputs = tx.outputs ? tx.outputs.length : 0; if (lodash.isArray(tx.outputs) && tx.outputs.length > 0 && tx.action != 'received') {
if (outputs > 1 && tx.action != 'received') {
tx.hasMultiplesOutputs = true; tx.hasMultiplesOutputs = true;
tx.recipientCount = outputs; tx.recipientCount = tx.outputs.length;
tx.amount = lodash.reduce(tx.outputs, function(total, o) { tx.amount = lodash.reduce(tx.outputs, function(total, o) {
o.amountStr = formatAmountStr(o.amount); o.amountStr = formatAmountStr(o.amount);
o.alternativeAmountStr = formatAlternativeStr(o.amount); o.alternativeAmountStr = formatAlternativeStr(o.amount);

2
webkitbuilds/.desktop
View file

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Version=1.6.1 Version=1.6.3
Name=Copay Name=Copay
Comment=A multisignature wallet Comment=A multisignature wallet
Exec=copay Exec=copay

2
webkitbuilds/setup-win.iss
View file

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Copay" #define MyAppName "Copay"
#define MyAppVersion "1.6.1" #define MyAppVersion "1.6.3"
#define MyAppPublisher "BitPay" #define MyAppPublisher "BitPay"
#define MyAppURL "https://copay.io" #define MyAppURL "https://copay.io"
#define MyAppExeName "Copay.exe" #define MyAppExeName "Copay.exe"