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

Merge pull request #3557 from bitpay/v1.5

Browse source 
Update master with v1.5
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 11:06:02 -03:00
commit 36e7a69e52
11 changed files with 14 additions and 15 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.5.2" version="1.5.3"
android-versionCode="56" android-versionCode="57"
ios-CFBundleVersion="1.5.2"> ios-CFBundleVersion="1.5.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.5.2</string> <string>1.5.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.5.2</string> <string>1.5.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.5.2.0" /> <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.5.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.5.2.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.5.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.5.2", "version": "1.5.3",
"keywords": [ "keywords": [
"wallet", "wallet",
"copay", "copay",

2
public/views/walletHome.html
View file

@ -452,7 +452,7 @@
<div ng-show="index.updatingTxHistory[index.walletId]"> <div ng-show="index.updatingTxHistory[index.walletId]">
<div ng-show="index.txProgress > 6" class="row m20t text-center"> <div ng-show="index.txProgress > 6" class="row m20t text-center">
<div class="circle-icon"> <div class="circle-icon">
<img src="/img/icon-sync.svg" alt="sync" width="70"> <img src="img/icon-sync.svg" alt="sync" width="70">
</div> </div>
<div translate class="size-12 text-gray m20t small-10 small-centered columns"> <div translate class="size-12 text-gray m20t small-10 small-centered columns">
Initial transaction history synchronization can take some minutes for wallets with many transactions. Initial transaction history synchronization can take some minutes for wallets with many transactions.

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

@ -28,6 +28,7 @@ angular.module('copayApp.controllers').controller('backupController',
return; return;
} }
$rootScope.$emit('Local/BackupDone');
notification.success(gettext('Success'), gettext('Encrypted export file saved')); notification.success(gettext('Success'), gettext('Encrypted export file saved'));
go.walletHome(); go.walletHome();
}); });
@ -96,6 +97,7 @@ angular.module('copayApp.controllers').controller('backupController',
self.error = true; self.error = true;
} else { } else {
self.error = false; self.error = false;
$rootScope.$emit('Local/BackupDone');
} }
return cb(ew); return cb(ew);
}); });

3
src/js/init.js
View file

@ -32,9 +32,6 @@ angular.element(document).ready(function() {
window.location = '#/cordova/pause/'; window.location = '#/cordova/pause/';
}, 100); }, 100);
} }
setTimeout(function() {
window.ignoreMobilePause = false;
}, 100);
}, false); }, false);
document.addEventListener('resume', function() { document.addEventListener('resume', function() {

2
webkitbuilds/.desktop
View file

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

2
webkitbuilds/setup-win32.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.5.2" #define MyAppVersion "1.5.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"

2
webkitbuilds/setup-win64.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.5.2" #define MyAppVersion "1.5.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"