Commit Graph

71 Commits

Author SHA1 Message Date
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
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 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 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 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
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
Manuel Araoz 9df76b90fd m-of-n integration complete 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 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
Bechi 7e165ca6ad copayers-page 2014-04-16 17:25:33 -03:00
Bechi 212b80b906 home page 2014-04-16 12:06:42 -03:00
Bechi 844fee49ad send-page 2014-04-16 10:52:13 -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
Manuel Araoz 241fb3aeb7 add encrypted Storage component 2014-04-15 18:13:49 -03:00
Manuel Araoz f84180e76c starting with encrypted storage 2014-04-15 18:13:49 -03:00
Bechi 8ae984177d fix 2014-04-15 17:51:43 -03:00
Bechi c2fcb67347 tx-page details 2014-04-15 17:45:53 -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
Bechi f878e4d222 fix 2014-04-15 12:56:03 -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
Bechi 27397cdb3c fix navbar 2014-04-15 11:46:19 -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
Gustavo Cortez 1ab8330ccd Fixed path to copayBundle.js on index.html files for home and tests. Commented methods that use http request. 2014-04-11 15:58:53 -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 12e30a5e63 fix conflixs 2014-04-08 18:49:07 -03:00
Bechi ab0345f342 transaction page 2014-04-08 14:16:38 -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
Bechi 2ee5bdae70 home page 2014-04-07 15:05:53 -03:00
Bechi 0d1263305c backup page 2014-04-03 16:32:17 -03:00
Ryan X. Charles 5356dc21fd Merge pull request #15 from colkito/feature/localstorage-support
added support for localstorage
2014-04-01 19:39:21 -04:00
Mario Colque c08eda28ab added support for localstorage 2014-04-01 18:22:07 -03:00