BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,220 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

317 Commits

Author SHA1 Message Date
Matias Alejo Garcia 78493f9d91 Merge pull request #720 from yemel/fix/wallet-import 
Fix error message on wallet import (wrong password)
 2014-06-19 17:22:01 -03:00
Matias Alejo Garcia 1dc420b215 Merge pull request #697 from cmgustavo/feature/addressbook 
Addressbook
 2014-06-19 17:03:18 -03:00
Gustavo Cortez 47dcc12910 Fix Conflicts: 
js/models/core/Wallet.js
 2014-06-19 16:43:34 -03:00
Matias Alejo Garcia 44901cd635 fix conflics 2014-06-19 16:34:37 -03:00
Yemel Jardi 06c1640d99 fix wallet import error message 2014-06-19 16:07:51 -03:00
Manuel Araoz e09d8e11d4 optimize txp protocol 2014-06-19 15:57:38 -03:00
Manuel Araoz b7af51ceee all tests passing 2014-06-19 15:57:38 -03:00
Manuel Araoz 889edf4b92 add preconditions and tests 2014-06-19 15:57:38 -03:00
Manuel Araoz 1457764930 change 'k' for 'ntxid' 2014-06-19 15:56:35 -03:00
Manuel Araoz d8e564b031 remove old methods 2014-06-19 15:56:35 -03:00
Manuel Araoz 03b4d16473 following the single TxProposal changes 2014-06-19 15:56:35 -03:00
Manuel Araoz 27de2896d8 working on refactor 2014-06-19 15:56:34 -03:00
Manuel Araoz 7001e21c71 ocha 2014-06-19 15:56:34 -03:00
Manuel Araoz b791d58c6c refactors 2014-06-19 15:56:34 -03:00
Manuel Araoz e0db6cac28 fix dependency management 2014-06-19 15:56:34 -03:00
Yemel Jardi 386a5bea6f move update indexes to the loading screen 2014-06-19 11:35:38 -03:00
Matias Alejo Garcia 8b5e616668 add tests for node 2014-06-19 00:33:27 -03:00
Matias Alejo Garcia 0481cf8e02 fixes POST request in node 2014-06-19 00:17:46 -03:00
Gustavo Cortez 4aa3915381 Sync address book with all copayer 2014-06-18 20:18:13 -03:00
Yemel Jardi 29920abdb3 Add wallet addresses index discovery on importing backup 2014-06-18 11:10:51 -03:00
Gustavo Cortez 21baa103bd Fix Conflicts: 
js/models/core/WalletFactory.js
 2014-06-18 10:03:22 -03:00
Gustavo Cortez f5aad7bd15 Addressbook on SendPage 2014-06-18 01:00:32 -03:00
Matias Alejo Garcia a83aa869fd remove .only 2014-06-17 23:16:15 -03:00
Matias Alejo Garcia cd71ce4421 fix conflics 2014-06-17 16:25:38 -03:00
Matias Alejo Garcia 710c9c9657 fix tests 2014-06-17 14:02:39 -03:00
Ryan X. Charles f7e34acae8 make mocha browser tests all run with no console errors 
...except Wallet and WalletFactory.
 2014-06-17 09:03:30 -07:00
Matias Alejo Garcia 2c60fd91c0 implements delete wallet, in backuptab 2014-06-16 17:37:33 -03:00
Matias Alejo Garcia 46feadf57c delete Wallet WIP 2014-06-16 15:58:10 -03:00
Yemel Jardi 6ab77e8711 Add user notifications on transaction signed and rejected events 2014-06-16 15:38:26 -03:00
Matias Alejo Garcia 00ca9f1c32 make unit configurable in settings. update after @cmgustavo comments 2014-06-16 12:44:18 -03:00
Matias Alejo Garcia 12b45fcfb9 rm log 2014-06-16 09:48:32 -03:00
Matias Alejo Garcia 194e5fed54 fix conflics 2014-06-13 19:47:11 -03:00
Matias Alejo Garcia 4fe58ec446 update to master 2014-06-13 19:47:11 -03:00
Matias Alejo Garcia 727bf8524a implement BITS + tests 2014-06-13 19:46:47 -03:00
Manuel Aráoz 618bff3895 Merge pull request #674 from cmgustavo/bug/01import-backup 
Open wallet livenet in testnet mode and viceversa when importing backup
 2014-06-13 16:48:29 -03:00
Gustavo Cortez 89b69e5d0a Fixes: open wallet livenet in testnet mode and viceversa when importing a backup 2014-06-13 11:47:22 -03:00
Manuel Aráoz 8d3ebcc0e2 Merge pull request #673 from yemel/feature/proposal-comments 
Add user comment to transaction propossal
 2014-06-13 11:30:12 -03:00
Yemel Jardi bcbb6b54d1 Add user comment to transaction propossal 2014-06-13 10:33:30 -03:00
Manuel Araoz 322a793b62 trying to fix tests 2014-06-12 14:36:00 -03:00
Matias Alejo Garcia 61410e519a fix secure:false 2014-06-10 10:49:26 -03:00
Matias Alejo Garcia 33fc4f8623 ssl and video settings 2014-06-10 10:06:08 -03:00
Matias Alejo Garcia 2385fc28d4 rm log 2014-06-09 21:27:29 -03:00
Matias Alejo Garcia 4ae3748414 checks network match when joining a wallet 2014-06-09 21:00:28 -03:00
Matias Alejo Garcia fcc1633816 rm log 2014-06-09 20:12:17 -03:00
Matias Alejo Garcia d0e20c1bff progressive reconnect time 2014-06-09 20:09:18 -03:00
Matias Alejo Garcia be7e122b0a rm variable reconnect time 2014-06-09 20:09:18 -03:00
Gustavo Maximiliano Cortez 43806a5825 Merge pull request #623 from matiu/feature/livenet2 
Feature/livenet2
 2014-06-09 18:10:51 -03:00
Matias Alejo Garcia 4b95002d47 fix type 2014-06-09 18:05:39 -03:00
Matias Alejo Garcia 8e8bf1fb84 update to use pkr.networkName 2014-06-09 18:01:15 -03:00
Matias Alejo Garcia 60ed55b564 fix tests 2014-06-09 17:52:51 -03:00