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 |
Manuel Aráoz
|
4b1210ebac
|
Merge pull request #73 from ryanxcharles/feature/add-bitcore
add latest bitcore master to the repo
|
2014-04-16 21:58:41 -03:00 |
Ryan X. Charles
|
e7fbc29ccb
|
Merge pull request #69 from maraoz/feature/setup-view
Feature/setup view
|
2014-04-16 21:54:50 -03:00 |
Ryan X. Charles
|
9a2c5a66fc
|
add latest bitcore master to the repo
|
2014-04-16 21:49:30 -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
|
73db414dd7
|
Merge pull request #72 from maraoz/fix/browser-API-tests
fix browser tests
|
2014-04-16 21:43:17 -03:00 |
Manuel Araoz
|
90cf7e7f77
|
fix browser tests
|
2014-04-16 21:39:42 -03:00 |
Manuel Aráoz
|
4e4dd249a8
|
Merge pull request #70 from ryanxcharles/feature/command-line-3
Command Line Interface #3
|
2014-04-16 21:19:32 -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
|
b442e110e4
|
make tests work by faking storage
|
2014-04-16 21:13:34 -03:00 |
Ryan X. Charles
|
08f918a9a7
|
add File storage class and tests
|
2014-04-16 21:12:27 -03:00 |
Ryan X. Charles
|
8166fa5c8e
|
change default network to "Base"
...since it won't be used for the command-line (yet).
|
2014-04-16 21:12:27 -03:00 |
Ryan X. Charles
|
6c52da3ddb
|
Merge pull request #71 from matiu/bug/fix-loading3
Bug/fix loading3
|
2014-04-16 21:11:43 -03:00 |
Matias Alejo Garcia
|
4a64482687
|
fix tests
|
2014-04-16 21:10:04 -03:00 |
Matias Alejo Garcia
|
8856683a17
|
fix join wallet WIP
|
2014-04-16 20:58:57 -03:00 |
Manuel Aráoz
|
a5262ef68a
|
Merge pull request #68 from matiu/bug/fix-loading2
fix create
|
2014-04-16 19:20:51 -03:00 |
Matias Alejo Garcia
|
e676f4e69d
|
fix create
|
2014-04-16 19:18:19 -03:00 |
Manuel Aráoz
|
23b512b940
|
Merge pull request #67 from matiu/bug/fix-loading
fix angular
|
2014-04-16 19:16:05 -03:00 |
Matias Alejo Garcia
|
f8b4f8e4c9
|
fix angular
|
2014-04-16 19:14:58 -03:00 |
Manuel Aráoz
|
5f21f2e80d
|
Merge pull request #64 from matiu/feature/walletFactory2
new WalletFactory
|
2014-04-16 18:49:05 -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 |
Manuel Araoz
|
a761db5ba2
|
fix bind usage in some tests
|
2014-04-16 12:41:13 -03:00 |
Manuel Aráoz
|
438ffe1ecc
|
Merge pull request #61 from maraoz/fix/browser-tests
Fix+add browser tests
|
2014-04-16 12:23:37 -03:00 |
Mario Colque
|
7f31c72758
|
Merge pull request #60 from bechi/feature/01-home-page
Feature/01 home page
|
2014-04-16 12:20:57 -03:00 |