BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bower conflics, rm logs

This commit is contained in:
Matias Alejo Garcia 2016-06-08 09:19:33 -03:00
parent 6cb1370d6e
commit 6c956dea50
No known key found for this signature in database
GPG Key ID: 02470DB551277AB3
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bower.json
View File

@ -12,7 +12,7 @@
"angular-gettext": "2.2.1", "angular-gettext": "2.2.1",
"angular-moment": "0.10.1", "angular-moment": "0.10.1",
"angular-qrcode": "monospaced/angular-qrcode#~6.2.1", "angular-qrcode": "monospaced/angular-qrcode#~6.2.1",
"angular-ui-router": "0.2.18", "angular-ui-router": "0.2.13",
"animate.css": "3.5.1", "animate.css": "3.5.1",
"foundation": "5.5.3", "foundation": "5.5.3",
"foundation-icon-fonts": "*", "foundation-icon-fonts": "*",
@ -24,8 +24,8 @@
"ng-csv": "~0.3.6" "ng-csv": "~0.3.6"
}, },
"resolutions": { "resolutions": {
"angular": "1.4.6", "angular": "1.5.3",
"qrcode-generator": "0.1.0", "qrcode-generator": "0.1.0",
"angular-ui-router": "0.2.18" "angular-ui-router": "0.2.13"
} }
} }

3
src/js/controllers/import.js
View File

@ -120,10 +120,7 @@ angular.module('copayApp.controllers').controller('importController',
self.loading = false; self.loading = false;
if (err) { if (err) {
console.log('[import.js.122:err:]',err); //TODO
if (err instanceof errors.NOT_AUTHORIZED) { if (err instanceof errors.NOT_AUTHORIZED) {
console.log('[import.js.125]'); //TODO
self.importErr = true; self.importErr = true;
} else { } else {
self.error = err; self.error = err;