From ef8e7ac5017f6fc8d0bd725ef0d8d8b0da40e420 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Sat, 22 Sep 2018 11:59:18 +0200 Subject: [PATCH 1/3] Fix RC version --- app-template/bitcoincom/appConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json index 2eab6232d..343dc724e 100644 --- a/app-template/bitcoincom/appConfig.json +++ b/app-template/bitcoincom/appConfig.json @@ -26,7 +26,7 @@ "description": "A Secure Bitcoin Wallet", "version": "5.1.3", "fullVersion": "5.1-rc2", - "androidVersion": "501003", + "androidVersion": "501300", "_extraCSS": "", "_enabledExtensions": { "coinbase": false, From e3a82a11183837d6f25b75f1b29c842798980856 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Sat, 22 Sep 2018 12:00:10 +0200 Subject: [PATCH 2/3] Reactivate shapeshift --- src/js/services/servicesService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/servicesService.js b/src/js/services/servicesService.js index ddd9db394..56d699e59 100644 --- a/src/js/services/servicesService.js +++ b/src/js/services/servicesService.js @@ -5,7 +5,7 @@ angular.module('copayApp.services').factory('servicesService', function(configSe name: 'shapeshift', title: 'Shapeshift', icon: 'icon-shapeshift', - href: 'https://shapeshift.io/' + sref: 'tabs.shapeshift' }]; root.register = function(serviceInfo) { From 9e01303f371dd3060776e063ea8a958a17e41b56 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Sat, 22 Sep 2018 12:00:58 +0200 Subject: [PATCH 3/3] Fix erase from a merge --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7968f2510..361ff1ab4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -57,7 +57,7 @@ module.exports = function(grunt) { command: 'node ./util/buildExternalServices.js' }, get_nwjs_for_pkg: { - command: 'if [ ! -d ./cache/0.19.5-pkg/osx64/nwjs.app ]; then cd ./cache; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output nwjs.zip; unzip nwjs.zip; mkdir -p ./0.19.5-pkg/osx64; cp -R ./nwjs-mas-v0.19.5-osx-x64/nwjs.app ./0.19.5-pkg/osx64/; fi' + command: 'if [ ! -d ./cache/0.19.4/osx64/nwjs.app ]; then mkdir -p ./cache/0.19.4/osx64; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output ./cache/nwjs.zip; unzip ./cache/nwjs.zip -d ./cache; cp -R ./cache/nwjs-mas-v0.19.5-osx-x64/nwjs.app ./cache/0.19.4/osx64/; fi' }, log_android: { command: 'adb logcat | grep chromium',