Commit Graph

78 Commits

Author SHA1 Message Date
Matias Alejo Garcia c665fe6eb1 resolve conflics 2014-01-20 23:54:59 -03:00
Matias Alejo Garcia 8df8b9e350 expand input / outputs 2014-01-20 23:01:07 -03:00
Matias Alejo Garcia aab8ac2e29 add scripts to tx 2014-01-20 18:11:50 -03:00
Matias Alejo Garcia 0c10fd35ea fix layouts problems in tx 2014-01-20 17:51:13 -03:00
Matias Alejo Garcia 8e7887fa40 isolate TX view 2014-01-20 17:39:27 -03:00
Manuel Araoz c538d4cd22 Merge branch 'master' of github.com:bitpay/insight into feature/tx-sound 2014-01-20 17:35:27 -03:00
Manuel Araoz 94a3f463ad bugfix and sound added to streamed txs for address 2014-01-20 17:34:59 -03:00
Mario Colque 0da8cdef87 Merge pull request #93 from bechi/feature/01navbar
01 navbar
2014-01-20 12:33:47 -08:00
Bechi fde5c638de 01 navbar 2014-01-20 17:18:21 -03:00
Matias Alejo Garcia c8218fb12c Merge pull request #90 from bechi/bug/01transaction-list
fix transaction list
2014-01-20 12:11:21 -08:00
Matias Alejo Garcia 05f2cf426c resolve merge 2014-01-20 16:47:46 -03:00
Matias Alejo Garcia 465e4698f6 more error handling 2014-01-20 16:40:20 -03:00
Bechi 6efbede361 fix transaction list 2014-01-20 15:31:02 -03:00
Manuel Araoz 76273d1c6c Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api 2014-01-20 13:31:57 -03:00
Bechi 685b0a277d fix block page 2014-01-20 12:38:51 -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 951eeea6d0 show sync status in /status page 2014-01-20 11:45:01 -03:00
Mario Colque d7ab549a5e added error messages for bad addresses, txids, blockids 2014-01-17 18:25:48 -03:00
Gustavo Cortez 8906a2f24f footer with info from bitcoind. it updates when get new block 2014-01-17 17:57:28 -03:00
Gustavo Maximiliano Cortez c8adefddd9 Merge pull request #79 from colkito/feature/404-redirect
Feature/404 redirect
2014-01-17 12:13:07 -08:00
Manuel Araoz 6c7ecef5d4 socket api for address transactions 2014-01-17 16:49:08 -03:00
Bechi 4a664f7123 transaction page 2014-01-17 16:20:07 -03:00
Mario Colque 73f9f6921d using values in BTC instead satoshis 2014-01-17 15:32:41 -03:00
Mario Colque afeec834a8 added new template for 404 2014-01-17 15:25:26 -03:00
Gustavo Cortez 6e46d85124 added alert if there are not transactions yet 2014-01-17 12:49:33 -03:00
Gustavo Cortez 81ec0142e6 added reward to list of transactions 2014-01-17 10:12:59 -03:00
Gustavo Cortez 522d35905a final step: colquito/complete info of transaction list 2014-01-16 18:28:23 -03:00
Gustavo Cortez 75b8d7279e first step: preparing a common file for list of transactions 2014-01-16 17:42:02 -03:00
Matias Alejo Garcia d5072df416 Merge pull request #69 from bechi/bug/fonts
fix fonts
2014-01-16 11:49:01 -08:00
Bechi 64cc928828 fix font 2014-01-16 16:46:00 -03:00
Mario Colque 6bf6c8a2ae Merge pull request #67 from matiu/feature/06sync
good boy!
2014-01-16 11:20:14 -08:00
Mario Colque 8c420d6780 Merge pull request #65 from cmgustavo/bug/02status
good boy!
2014-01-16 10:35:04 -08:00
Gustavo Cortez ab85012bdf replaced getBestBlockHash for bot method (getBlockCount + getBlockHash) to get the last block hash. 2014-01-16 15:33:33 -03:00
Matias Alejo Garcia 3a7ad68ef2 displays outpoints 2014-01-16 15:07:57 -03:00
Bechi cf61b04211 fix tx 2014-01-16 14:25:00 -03:00
Bechi 12093e8250 block page 2014-01-16 14:16:01 -03:00
Bechi ec8a2e9064 fix get. blockpage ux 2014-01-16 13:36:02 -03:00
Mario Colque ffce4526a6 Merge pull request #59 from cmgustavo/feature/status_api
wow!
2014-01-16 06:35:21 -08:00
Gustavo Cortez acb54a0190 front-end for status network information in a new page 2014-01-16 10:54:21 -03:00
Manuel Araoz 237bb81e19 Merge branch 'master' of github.com:bitpay/mystery into feature/human-readable-times
Conflicts:
	package.json
2014-01-15 15:21:06 -03:00
Manuel Aráoz ea141f7120 Merge pull request #51 from colkito/feature/homepage-default-data
Feature/homepage default data
2014-01-15 09:36:20 -08:00
Mario Colque df4b54af2f Merge pull request #52 from bechi/feature/header
awesome!
2014-01-15 08:20:48 -08:00
Bechi 2fac495a69 header 2014-01-15 13:15:10 -03:00
Mario Colque 0d09aaec51 added init for controller 2014-01-15 12:40:24 -03:00
Gustavo Cortez 0cabaf6de9 loading message before finish async request 2014-01-15 10:34:25 -03:00
Gustavo Cortez ab635332cc added reward value to transactions 2014-01-15 09:02:20 -03:00
Gustavo Cortez c734ec40a3 Merge branch 'master' into feature/get_async_transactions 2014-01-14 20:35:33 -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
Manuel Araoz b6f4aa78bc show new blocks in homepage 2014-01-14 19:42:38 -03:00