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

Merge pull request #4660 from matiu/ver/v2.4.2

Browse source 
Ver/v2.4.2
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-08 19:59:58 -03:00 • committed by GitHub
commit 2c442d3642
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cordova/android/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="v0.10.7" android:windowSoftInputMode="adjustPan" package="com.bitpay.copay" xmlns:android="http://schemas.android.com/apk/res/android"> <manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="v0.10.7" android:windowSoftInputMode="adjustPan" package="com.bitpay.copay" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" android:icon="@drawable/copay" android:label="@string/app_name"> <application android:hardwareAccelerated="true" android:icon="@drawable/copay" android:label="@string/app_name" android:allowBackup="false">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/app_name" android:launchMode="singleTop" android:name="CordovaApp" android:theme="@android:style/Theme.Black.NoTitleBar"> <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/app_name" android:launchMode="singleTop" android:name="CordovaApp" android:theme="@android:style/Theme.Black.NoTitleBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -29,6 +29,7 @@
</activity> </activity>
</application> </application>
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" /> <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.FLASHLIGHT" /> <uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-feature android:name="android.hardware.camera" android:required="false" /> <uses-feature android:name="android.hardware.camera" android:required="false" />

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="2.4.1" version="2.4.2"
android-versionCode="113" android-versionCode="114"
ios-CFBundleVersion="2.4.1"> ios-CFBundleVersion="2.4.2">
<name>Copay</name> <name>Copay</name>
<description> <description>
A secure bitcoin wallet for friends and companies. A secure bitcoin wallet for friends and companies.

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="2.4.1.0" /> <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="2.4.2.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

@ -11,7 +11,7 @@
<Language code="pl" /> <Language code="pl" />
<Language code="cs" /> <Language code="cs" />
</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="2.4.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="2.4.2.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" />

4
package.json
View file

@ -2,8 +2,8 @@
"name": "copay", "name": "copay",
"description": "A multisignature bitcoin wallet", "description": "A multisignature bitcoin wallet",
"author": "BitPay", "author": "BitPay",
"version": "2.4.1", "version": "2.4.2",
"androidVersionCode": "113", "androidVersionCode": "114",
"keywords": [ "keywords": [
"wallet", "wallet",
"copay", "copay",

2
webkitbuilds/.desktop
View file

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

11
webkitbuilds/build-osx.sh
View file

@ -55,8 +55,8 @@ pushd "${STAGING_DIR}"
popd popd
# Fix size to 150MB # Fix size to 250MB
SIZE=150 SIZE=250
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: Cannot compute size of staging dir" echo "Error: Cannot compute size of staging dir"
@ -75,10 +75,9 @@ then
# export CHILD_PLIST=child.plist # export CHILD_PLIST=child.plist
export APP_PATH=${STAGING_DIR}/${APP_NAME}.app export APP_PATH=${STAGING_DIR}/${APP_NAME}.app
codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Frameworks/nwjs Helper.app" && echo "Sign 1" codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Helper.app" && echo "Sign 1"
codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Frameworks/nwjs Helper EH.app" && echo "Sign 2" codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Framework.framework/Resources/app_mode_loader.app" && echo "Sign 2"
codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Frameworks/nwjs Helper NP.app" && echo "Sign 3" codesign --deep -s "${IDENTITY}" $APP_PATH && echo "Sign 3"
codesign --deep -s "${IDENTITY}" $APP_PATH && echo "Sign 4"
echo "Signing Done" echo "Signing Done"
fi fi

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 "2.4.1" #define MyAppVersion "2.4.2"
#define MyAppPublisher "BitPay" #define MyAppPublisher "BitPay"
#define MyAppURL "https://copay.io" #define MyAppURL "https://copay.io"
#define MyAppExeName "Copay.exe" #define MyAppExeName "Copay.exe"