Commit graph

119 commits

Author SHA1 Message Date
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
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
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
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
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
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
Ryan X. Charles
96a6203bb0 make my code work with the latest interface changes
...to Wallet and WalletFactory
2014-04-16 21:13:35 -03:00
Ryan X. Charles
5f8deb7d0b update File to write wallets to different files
the walletId is the filename
2014-04-16 21:13:35 -03:00
Ryan X. Charles
08f918a9a7 add File storage class and tests 2014-04-16 21:12:27 -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
Manuel Araoz
609ba4ef71 renaming files 2014-04-16 11:55:18 -03:00
Manuel Araoz
929c6ffa6d securely store encryptation passwords 2014-04-15 19:14:42 -03:00
Matias Alejo Garcia
b382e2b99f fix mocha testing! 2014-04-15 18:47:16 -03:00
Matias Alejo Garcia
d4b2ac1ad4 add wallet tests 2014-04-15 18:46:19 -03:00
Matias Alejo Garcia
341c9d8ffa open wallet working 2014-04-15 18:46:19 -03:00
Gustavo Maximiliano Cortez
65cbf5b46a Merge pull request #56 from colkito/fix/remove-http-module
added support for http request on the browser
2014-04-15 18:46:03 -03:00
Mario Colque
b21af3334e added support for http request on the browser 2014-04-15 18:44:10 -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
Mario Colque
139628e066 added support for store and broadcast 2014-04-15 16:50:16 -03:00
Manuel Aráoz
b54832567b Merge pull request #52 from matiu/bug/plain-storage
fix plan storage
2014-04-15 15:26:45 -03:00
Matias Alejo Garcia
ebc2d0033b fix plan storage 2014-04-15 15:22:10 -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
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