Commit Graph

13 Commits

Author SHA1 Message Date
Matias Alejo Garcia
1c6b506dbb resolve merge conflits 2014-01-20 16:53:54 -03:00
Matias Alejo Garcia
05f2cf426c resolve merge 2014-01-20 16:47:46 -03:00
Matias Alejo Garcia
f619192708 better error API handling 2014-01-20 16:11:35 -03:00
Manuel Araoz
914671e352 show timestamp for unconfirmed transactions 2014-01-20 15:37:44 -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
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
Mario Colque
d7ab549a5e added error messages for bad addresses, txids, blockids 2014-01-17 18:25:48 -03:00
Manuel Araoz
6c7ecef5d4 socket api for address transactions 2014-01-17 16:49:08 -03:00
Mario Colque
57ec70d88d rename project 2014-01-17 11:46:12 -03:00
Gustavo Cortez
dc6e64f8bc fix url for get transactions 2014-01-15 10:22:07 -03:00
Gustavo Cortez
521a0d6a44 front-end: Completed block info. Getting aync transaction in BlockPage and AddrPage 2014-01-14 20:34:01 -03:00
Gustavo Cortez
d0874c48cf front-end with angularjs: blockpage and transaction page. Basic information. 2014-01-09 15:13:26 -03:00