Commit graph

52 commits

Author SHA1 Message Date
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
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 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
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
Matias Alejo Garcia
df23125f5e tx broadcasting working 2014-04-16 22:12:38 -03:00
Manuel Araoz
9df76b90fd m-of-n integration complete 2014-04-16 21:45:06 -03:00
Manuel Araoz
b504074009 actually create wallet and redirect 2014-04-16 21:45:06 -03:00
Manuel Araoz
8478402237 add wallet setup view (not integrated) 2014-04-16 21:45:06 -03:00
Matias Alejo Garcia
8856683a17 fix join wallet WIP 2014-04-16 20:58:57 -03:00
Matias Alejo Garcia
e676f4e69d fix create 2014-04-16 19:18:19 -03:00
Matias Alejo Garcia
f8b4f8e4c9 fix angular 2014-04-16 19:14:58 -03:00
Mario Colque
97ecd66bd8 added balance for each address 2014-04-16 18:01:37 -03:00
Matias Alejo Garcia
536fe90431 new WalletFactory 2014-04-16 17:51:42 -03:00
Matias Alejo Garcia
b382e2b99f fix mocha testing! 2014-04-15 18:47:16 -03:00
Matias Alejo Garcia
341c9d8ffa open wallet working 2014-04-15 18:46:19 -03:00
Mario Colque
139628e066 added support for store and broadcast 2014-04-15 16:50:16 -03:00
Mario Colque
072e55665d Merge pull request #51 from cmgustavo/bug/01-generateaddress
Fixed generateAddress in front-end...
2014-04-15 15:05:34 -03:00
Gustavo Cortez
86e47b8fcd Fixed generateAddress in front-end. Fixed angular front-end when connection rejected 2014-04-15 14:58:02 -03:00
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
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
Mario Colque
52a4ae522e removed comments and logs 2014-04-14 18:03:40 -03:00
Mario Colque
5bf4bca0d3 added list of pending transactions 2014-04-14 17:58:12 -03:00
Mario Colque
9db1740b1f Added support for list and create address in a opened wallet 2014-04-14 16:48:12 -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
c5b1fca910 tx proposal test. PrivateKey 2014-04-14 14:15:09 -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
Mario Colque
5b8b000c3d several improvements to p2p connections 2014-04-04 18:29:32 -03:00
Mario Colque
c08eda28ab added support for localstorage 2014-04-01 18:22:07 -03:00
Mario Colque
92f4422841 fix conflicts 2014-03-31 18:05:35 -03:00
Mario Colque
99b81128fd Added the multipeer connections support 2014-03-31 16:48:43 -03:00
Gustavo Cortez
4cd48b7bb2 integrate new name and header. Signin/signout flow 2014-03-31 12:48:35 -03:00
Ryan X. Charles
7176e49509 rename cosign -> copay throughout code
Also, "cosigners" becomes "copayers"
2014-03-28 14:12:56 -04:00
Mario Colque
64fc2dd22b fix conflicts 2014-03-27 16:43:51 -03:00
Mario Colque
76eadc17cf added PeerJS and initial Network service 2014-03-27 16:31:42 -03:00
Gustavo Cortez
7be9cec630 tinyfix: collapse one at a time 2014-03-26 18:07:28 -03:00
Gustavo Cortez
f325b42989 forms, example values, qr generator 2014-03-26 17:56:11 -03:00