Commit Graph

420 Commits

Author SHA1 Message Date
Matias Pando 2b540264a5 Conflicts solved 2014-09-12 12:55:36 -03:00
Matias Pando ecea1a654d If the copayer upload a backup it does not wait for others 2014-09-12 12:55:36 -03:00
Ivan Socolsky 81a73e6f2a resolved 2014-09-12 10:40:47 -03:00
Ivan Socolsky 1f83f85189 separated subscribeToAddresses from getAddressesInfo 2014-09-12 10:25:38 -03:00
Manuel Araoz 89c74aa6e4 settings: remove console.log 2014-09-11 09:29:35 -07:00
Manuel Araoz 76f3b1c321 settings: maintain livenet and testnet simultainously 2014-09-10 13:43:58 -07:00
Manuel Araoz 7159cdb712 settings: added test for new secret scheme 2014-09-10 13:43:58 -07:00
Manuel Araoz 520fd762ba settings: added network to wallet secret 2014-09-10 13:42:08 -07:00
Manuel Araoz 4dffcccf19 settings: works with 2-3 wallet 2014-09-10 13:39:22 -07:00
Manuel Araoz 3effa3d0b1 settings: it works 2014-09-10 13:39:22 -07:00
Manuel Araoz 53869531c2 settings: fix balance bug 2 2014-09-10 13:33:15 -07:00
Manuel Araoz c1d8103374 fix settings.js 2014-09-10 13:21:35 -07:00
Manuel Araoz c9cb2aae57 settings: small refactor 2014-09-10 13:19:27 -07:00
Manuel Araoz cff9f567bb settings: no settings model after all 2014-09-10 13:19:27 -07:00
Manuel Araoz f443843d49 settings: change old settings controller 2014-09-10 13:19:27 -07:00
Manuel Araoz f9a31ce9aa settings: nuke verbose 2 2014-09-10 13:19:27 -07:00
Manuel Araoz ecceb668e3 settings: nuke verbose 2014-09-10 13:19:27 -07:00
Manuel Araoz d2861d9c2a settings: create new model 2014-09-10 13:19:27 -07:00
Ivan Socolsky baf92d4c1b resolved conflict 2014-09-10 15:09:11 -03:00
Matias Alejo Garcia 04dbbc0b45 add ts to p2p sync 2014-09-09 23:00:24 -03:00
Matias Alejo Garcia d838a29d02 fix some wallet tests 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia 74593fe778 fix signed message 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia 45fd46e3bc fix reconnect to insight 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia dd8fcaa1b1 refacor blockchain handlers 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia 1c5b59a263 fix addr 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia db5505b1e3 fix received 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia fb05586c32 fix addr 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia 255affe382 fix received 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia b5b7acd5a4 move blockchain event handles to wallet 2014-09-09 22:30:21 -03:00
Gustavo Maximiliano Cortez ea91c603f9 Merge pull request #1315 from isocolsky/fix/insight_down
Catching errors when trying to create new TXP
2014-09-09 10:38:52 -03:00
Matias Alejo Garcia 765d3dd658 fix sighash opts + add tests 2014-09-09 08:42:32 -03:00
Christopher Jeffrey 125b8a807b test: fix Wallet test pertaining to null/0 fees. 2014-09-08 18:47:42 -07:00
Christopher Jeffrey 0a1fab8e2a paypro: fix failing paypro test. 2014-09-08 17:52:22 -07:00
Christopher Jeffrey 49d362a238 paypro: improve PaymentRequest verification using the latest bitcore. 2014-09-08 17:00:38 -07:00
Ivan Socolsky cef93325f4 Catch error when creating new TXP 2014-09-08 16:37:33 -03:00
Ivan Socolsky 152ab7aa44 Refactored Wallet#createTx 2014-09-08 15:50:20 -03:00
Ivan Socolsky 664c02dc84 Set seen on incoming tx proposal 2014-09-08 14:27:58 -03:00
Gustavo Maximiliano Cortez 5ac5aa3c69 Merge pull request #1297 from eordano/beauty/Wallet
JSDoc for wallet.js
2014-09-08 13:00:34 -03:00
Matias Alejo Garcia 1aa46b6ad0 Merge pull request #1298 from isocolsky/fix/update_balance
Fixed reentrant event updating balance multiple times
2014-09-05 15:07:25 -03:00
Ivan Socolsky 48cbd01686 Fixed reentrant event 2014-09-05 12:03:50 -03:00
Esteban Ordano f397d1f94f JSDoc for wallet.js 2014-09-05 11:49:35 -03:00
Gustavo Maximiliano Cortez db3ca4ceef Merge pull request #1270 from isocolsky/fix/remove_spent
Removed proposals with spent inputs
2014-09-04 18:25:11 -03:00
Ivan Socolsky ace301d1f8 Only remove pending txps 2014-09-04 17:37:38 -03:00
Matias Pando 89dba4c616 Added secret number feature 2014-09-03 16:51:02 -03:00
Ivan Socolsky 55aa4e8f68 Added call from UX 2014-09-03 11:55:18 -03:00
Ivan Socolsky 8b55f69d40 Add method removeTxWithSpentInputs to wallet 2014-09-03 11:54:40 -03:00
Esteban Ordano fdf25d0124 Using underscore in a few files 2014-09-03 10:27:42 -03:00
Esteban Ordano a0c7d2cb66 Merge pull request #1258 from cmgustavo/feature/01-remove-peerjs
Feature: remove peerjs
2014-09-02 18:23:36 -03:00
Gustavo Maximiliano Cortez ac78e2d1e7 Remove peerjs 2014-09-02 10:48:22 -03:00
Esteban Ordano 283d937ae7 Multiline logs into one line 2014-09-01 17:48:46 -03:00