Commit Graph

76 Commits

Author SHA1 Message Date
Ryan X. Charles b048571900 Merge pull request #49 from matiu/feature/disable-logs
Feature/disable logs
2014-04-15 14:49:55 -03:00
Matias Alejo Garcia 8cf91d027e add option to enable console.logs 2014-04-15 14:28:49 -03:00
Gustavo Cortez db4da73117 Signout link is now in the navbar 2014-04-15 14:02:45 -03:00
Matias Alejo Garcia d0e114c346 fix wallet ids 2014-04-15 13:21:14 -03:00
Gustavo Maximiliano Cortez d7dff5b5d2 Merge pull request #45 from maraoz/remove/files
remove WalletFactory file (everything is in Wallet)
2014-04-15 13:02:22 -03:00
Bechi 779f794ef5 fix conflicts 2014-04-15 12:59:35 -03:00
Matias Alejo Garcia 4dcd18c42f wallet @browser working again 2014-04-15 12:52:28 -03:00
Bechi d535522e9d add icon navbar 2014-04-15 12:33:00 -03:00
Matias Alejo Garcia eff20ec49a mocha test working again 2014-04-15 12:17:28 -03:00
Manuel Araoz f22ca08b39 remove WalletFactory file (everything is in Wallet) 2014-04-15 10:56:23 -03:00
Matias Alejo Garcia a187726fca WIP wallet working again 2014-04-15 10:23:53 -03:00
Manuel Araoz 00d4a4b979 adding wallet factory 2014-04-14 18:30:47 -03:00
Gustavo Cortez eb4731715f tiny fix 2014-04-14 18:16:16 -03:00
Gustavo Maximiliano Cortez 5e30bf9baf Merge pull request #36 from colkito/feature/list-pending-transactions
Feature/list pending transactions
2014-04-14 18:12:52 -03:00
Manuel Aráoz b42ab80128 Merge pull request #37 from matiu/feature/wallet-integration2
Feature/wallet integration2
2014-04-14 18:11:19 -03:00
Matias Alejo Garcia c5a5129e83 fix test in browser 2014-04-14 18:08:18 -03:00
Mario Colque 52a4ae522e removed comments and logs 2014-04-14 18:03:40 -03:00
Mario Colque 3e20bbc219 merge 2014-04-14 18:00:14 -03:00
Mario Colque 5bf4bca0d3 added list of pending transactions 2014-04-14 17:58:12 -03:00
Matias Alejo Garcia 124e1dff19 read/load on Wallet 2014-04-14 17:42:10 -03:00
Gustavo Maximiliano Cortez 0941486859 Merge pull request #34 from colkito/feature/list-and-create-address
Added support for list and create address in a opened wallet
2014-04-14 17:27:46 -03:00
Matias Alejo Garcia 296c78cdf0 Wallet Class WIP 2014-04-14 17:18:39 -03:00
Mario Colque 127cef62ac removed copayBundle.js 2014-04-14 16:52:36 -03:00
Mario Colque 9db1740b1f Added support for list and create address in a opened wallet 2014-04-14 16:48:12 -03:00
Manuel Araoz 3c19aee968 remove browser bundle 2014-04-14 16:11:50 -03:00
Manuel Araoz 59c00da592 architecture refactor 2014-04-14 15:39:02 -03:00
Matias Alejo Garcia 85d02a6977 tx proposal test working with new bitcore Builder 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia 7693f0a7ff many bugs fix in peer connections, and ux 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia ac784ad9ae txproposal comuninication between peers. Still WIP 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia 81be01d197 txpropal MERGE working! 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia c5b1fca910 tx proposal test. PrivateKey 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia c3efcb3f27 add sign in block 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia 5e2120b0e9 BIP32 PrivateKey wrapper 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia e0993c90a6 txproposal basic features and test 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia 4f2499e13c fix test on node 2014-04-14 14:15:09 -03:00
Gustavo Cortez 6b33f0425a Fixed conflicts with 'master'.
Merge branch 'master' into feature/wallet

Conflicts:
	copay.js
2014-04-11 15:08:00 -03:00
Gustavo Cortez ad56a30e77 Wallet model and testing 2014-04-10 17:57:41 -03:00
Mario Colque c165efa9e4 moved copayBundle.js 2014-04-10 12:36:17 -03:00
Matias Alejo Garcia 0780879205 add maxPeer check 2014-04-09 11:05:25 -03:00
Matias Alejo Garcia 9eadda0ed3 adds PublicKeyRing syncing to the new classes schema 2014-04-09 02:20:28 -03:00
Matias Alejo Garcia fab2c8a505 new CopayPeer class. Peers working! 2014-04-08 18:35:43 -03:00
Matias Alejo Garcia 9ca83e35fc fix peers, pubkey WIP 2014-04-08 00:54:38 -03:00
Matias Alejo Garcia a658ec8452 copay tests in the browser! 2014-04-07 15:31:41 -03:00
Matias Alejo Garcia 6b2d3cda35 Add Dummy Storage class 2014-04-07 14:36:57 -03:00
Matias Alejo Garcia 7141dee5c8 fix tests 2014-04-07 13:26:29 -03:00
Matias Alejo Garcia 1775d98746 #merge support to PubKeyRing 2014-04-07 11:46:45 -03:00
Matias Alejo Garcia f089246b88 add more tests 2014-04-04 20:16:15 -03:00
Matias Alejo Garcia 8b42f8508b fix params 2014-04-04 19:59:00 -03:00
Matias Alejo Garcia b1b8a44a7d fix params 2014-04-04 19:40:30 -03:00
Matias Alejo Garcia 96e9882a62 fix after comments 2014-04-04 19:39:21 -03:00