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

287 Commits

Author SHA1 Message Date
Manuel Araoz 5847d6aff2 optimize PrivateKey with cache 2014-04-17 18:56:44 -03:00
Manuel Aráoz f90decca0e Merge pull request #87 from ryanxcharles/bug/fix-tests 
add setFromObj to FakeStorage - and fix publicKeyring capitalization
 2014-04-17 18:56:28 -03:00
Ryan X. Charles 4681783231 add setFromObj to FakeStorage - and fix publicKeyring capitalization 
...to fix tests
 2014-04-17 18:55:17 -03:00
Manuel Aráoz 9319c7f93f Merge pull request #84 from ryanxcharles/feature/wallet-file-consistency 
WIP: add setFromObj and getEncryptedObj to storage classes
 2014-04-17 18:35:08 -03:00
Gustavo Maximiliano Cortez d34dfc746c Merge pull request #85 from colkito/feature/wallet-backup-support 
Feature/wallet backup support
 2014-04-17 18:21:56 -03:00
Gustavo Maximiliano Cortez dc49a4dc68 Merge pull request #83 from matiu/feature/ux1 
Feature/ux1
 2014-04-17 18:20:55 -03:00
Matias Alejo Garcia 1954978202 parse output TX to show before signing (WIP) 2014-04-17 18:06:09 -03:00
Mario Colque 2c0b733025 fix conflicts 2014-04-17 18:05:26 -03:00
Ryan X. Charles 69c5c3bc2e add setFromObj and getEncryptedObj to storage classes 
This is so that you can export the file from the browser and use the same file
in the wallet file from the command-line. I have made encryption work
equivalently between the browser and node.
 2014-04-17 18:04:56 -03:00
Mario Colque 2838b3ecd2 added support for the wallet backups 2014-04-17 18:02:20 -03:00
Matias Alejo Garcia 5eca1a63c2 filter out change address. Better refresh 2014-04-17 17:22:50 -03:00
Gustavo Maximiliano Cortez 5f959aa5d9 Merge pull request #82 from matiu/feature/signin4 
Feature/signin4
 2014-04-17 17:12:25 -03:00
Matias Alejo Garcia 9ead0f69f4 clean up index 2014-04-17 17:10:32 -03:00
Matias Alejo Garcia f9ee67b548 clean config for peerjs 2014-04-17 17:10:32 -03:00
Matias Alejo Garcia b79aefefee remove logs 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia d5fe53d23e better p2p handling 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia 1e64031ec3 options for running with local peerJs server. Ux fixes 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia 6627184ebc hide features until wallet isComplete() 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia 8f964bf007 Merge pull request #81 from cmgustavo/feature/refactory-get-balance 
Feature/refactory get balance
 2014-04-17 17:06:59 -03:00
Gustavo Cortez f5fd03ad3c Fix refactory for createTx. 2014-04-17 17:01:45 -03:00
Gustavo Cortez f55d243bed Refactory get balance 's methods 2014-04-17 16:42:27 -03:00
Gustavo Maximiliano Cortez e88c80bc3e Merge pull request #79 from maraoz/optimize/tests 
optimize some tests
 2014-04-17 15:30:05 -03:00
Gustavo Maximiliano Cortez 805125cd54 Merge pull request #78 from matiu/feature/signin 
Feature/signin
 2014-04-17 15:23:33 -03:00
Manuel Araoz bca120a7b6 optimize some tests 2014-04-17 15:04:55 -03:00
Matias Alejo Garcia fc7354e93a import option (not working yet) 2014-04-17 14:28:50 -03:00
Matias Alejo Garcia 9733305aea ux fixes 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia a51ed6c66d fix walletID list 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia e28be27bf3 better signin page 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia ff37bea6fb Merge pull request #75 from cmgustavo/feature/socket-io-support 
Feature/socket io support
 2014-04-17 13:37:58 -03:00
Gustavo Cortez 8ab479691d Cleaning controllers. Also call connect socket-ii in all pages. Everything work! 2014-04-17 13:25:36 -03:00
Gustavo Cortez 5d83d180da Adapting totalBalance to new generic controller 2014-04-17 12:03:18 -03:00
Gustavo Cortez 2454d930fa Merge branch 'master' into feature/socket-io-support 
Fix conflicts:
	js/app.js
	js/controllers/signin.js
 2014-04-17 11:58:11 -03:00
Gustavo Cortez e18599481e Update balance below qr-code when select an address. 2014-04-17 11:52:42 -03:00
Gustavo Cortez c9008830b0 Fixed float value to 4 decimals. 2014-04-17 11:51:56 -03:00
Gustavo Maximiliano Cortez 73d5266a89 Merge pull request #77 from matiu/bug/fix-uxrefresh 
fix uxrefresh with new #setup - awesome!!
 2014-04-17 11:49:02 -03:00
Matias Alejo Garcia a8d85adc84 fix uxrefresh with new #setup 2014-04-17 11:46:49 -03:00
Gustavo Cortez dd62ab16d1 Fix balance value when sign out (a wallet with btc) and create a new wallet (this showed value of the previous wallet) 2014-04-17 11:23:04 -03:00
Gustavo Cortez 9fdb04e868 Fixed socke-emit-on 
Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
 2014-04-17 11:11:17 -03:00
Ryan X. Charles aaaed8e7ee Merge pull request #62 from maraoz/fix/bind-usage 
fix bind usage in some tests
 2014-04-17 10:30:23 -03:00
Manuel Aráoz 1d511141b9 Merge pull request #76 from ryanxcharles/bug/remove-console-log 
change console.log to log and make default not verbose
 2014-04-17 09:46:25 -03:00
Ryan X. Charles 1c2b8ee7ec Merge pull request #66 from colkito/feature/addresses-balance 
added balance for each address
 2014-04-17 09:41:47 -03:00
Ryan X. Charles 0d81712bef change console.log to log and make default not verbose 2014-04-17 09:38:46 -03:00
Mario Colque b95af5e53a fix conflicts 2014-04-17 09:35:46 -03:00
Gustavo Cortez eaa1bc37e0 Initial getBalance of all your addresses. Socket-io that listening if your address receives btc. 
Known bug: if you add new the address you can to recall socket-io. Socket-io should be listening on headerController.
 2014-04-17 06:43:30 -03:00
Gustavo Cortez 864156ed4f Front-end: fix when generating new address. 2014-04-17 01:55:11 -03:00
Gustavo Cortez 7d52f8487b Merge branch 'master' into feature/socket-io-support 
Fixed conflicts on:
	index.html
	js/app.js
 2014-04-17 00:43:50 -03:00
Gustavo Cortez 4865513c21 Socket-io integration. Using a local socket.io.js file. 2014-04-17 00:36:08 -03:00
Ryan X. Charles 00529ba78f Merge pull request #74 from matiu/feature/txbroadcasting 
tx broadcasting working
 2014-04-16 22:18:39 -03:00
Matias Alejo Garcia df23125f5e tx broadcasting working 2014-04-16 22:12:38 -03:00
Ryan X. Charles 73e7b0d0e0 Merge pull request #63 from bechi/feature/copayers-page 
copayers-page
 2014-04-16 22:00:02 -03:00