Matias Alejo Garcia
|
05f2cf426c
|
resolve merge
|
2014-01-20 16:47:46 -03:00 |
Manuel Araoz
|
914671e352
|
show timestamp for unconfirmed transactions
|
2014-01-20 15:37:44 -03:00 |
Manuel Araoz
|
86e149a0d8
|
remove log
|
2014-01-20 14:31:01 -03:00 |
Manuel Araoz
|
37d18b7b2d
|
fixing socket API
|
2014-01-20 14:30:25 -03:00 |
Manuel Araoz
|
cf5aea1165
|
socket.io and angular proper integration
|
2014-01-20 13:31:37 -03:00 |
Matias Alejo Garcia
|
5468895e34
|
fix socket io name error
|
2014-01-20 12:10:49 -03:00 |
Manuel Araoz
|
b7d3666249
|
Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api
Conflicts:
app/controllers/socket.js
app/models/Transaction.js
lib/PeerSync.js
public/js/controllers/address.js
public/js/controllers/index.js
public/js/controllers/transactions.js
public/views/transaction.html
|
2014-01-20 11:47:22 -03:00 |
Matias Alejo Garcia
|
10972fd8dd
|
sync API not emits "sync" thru socket.io
|
2014-01-19 12:33:39 -03:00 |
Manuel Araoz
|
6c7ecef5d4
|
socket api for address transactions
|
2014-01-17 16:49:08 -03:00 |
Manuel Araoz
|
5fe57077d7
|
hello world version of address specific socket
|
2014-01-17 15:25:15 -03:00 |
Matias Alejo Garcia
|
59a34beda0
|
fixes jshint warnings. add config for disabling sync
|
2014-01-16 23:23:10 -03:00 |
Manuel Araoz
|
face519245
|
move socket controller to controllers
|
2014-01-16 17:25:52 -03:00 |