Commit Graph

1124 Commits

Author SHA1 Message Date
Manuel Araoz ead58e1e52 Merge branch 'master' of github.com:bitpay/mystery into feature/p2p-import
Conflicts:
	app/controllers/transactions.js
	app/models/Transaction.js
	config/env/development.js
	lib/Sync.js
	test/model/block.js
2014-01-10 16:12:11 -03:00
Manuel Araoz df397936ea p2p block and transaction importing 2014-01-10 16:02:33 -03:00
Gustavo Maximiliano Cortez a5b9df2aff Merge pull request #18 from matiu/bug/TX-ID-64496d005faee77ac5a18866f50af6b8dd1f60107d6795df34c402747af98608
fix issue with strange TX -- good!
2014-01-10 10:56:29 -08:00
Matias Alejo Garcia 2082f66938 fix issue with strange TX 2014-01-10 15:51:19 -03:00
Mario Colque fd86e6d074 Merge pull request #16 from cmgustavo/feature/home-page
Great!
2014-01-10 06:52:46 -08:00
Mario Colque 219e583c51 Merge pull request #15 from cmgustavo/feature/block-page
great!
2014-01-10 06:51:11 -08:00
Gustavo Maximiliano Cortez b5e85d951f Merge pull request #17 from colkito/feature/addresspage_templates
Feature/addresspage templates -- Good!
2014-01-10 06:50:49 -08:00
Mario Colque 2bf3fd8a13 BigNum module name fixed 2014-01-10 11:38:51 -03:00
Mario Colque 6d44c9b53a added new template and controller for address page 2014-01-10 11:36:43 -03:00
Mario Colque a774a711b3 added angular-qrcode 2014-01-10 11:36:16 -03:00
Gustavo Cortez 67857abcc7 Cleaning homepage for now. It does not get any values from API, only shows a link to blocks list. 2014-01-10 10:46:09 -03:00
Gustavo Cortez 8d8a1c256b fix text in block and transaction page 2014-01-10 10:25:16 -03:00
Gustavo Cortez 69678cf388 Merge branch 'master' into feature/block-page 2014-01-10 10:05:25 -03:00
Gustavo Cortez 9db404c7f2 Prepared BlockPage (look&feel) for getting info by API 2014-01-10 10:03:48 -03:00
Mario Colque f2917c51ca added new route for address page 2014-01-10 09:37:18 -03:00
Mario Colque 63dfe42ce8 date style fixed 2014-01-10 09:36:09 -03:00
Mario Colque 9c7239e740 Merge pull request #14 from cmgustavo/feature/transaction-page
great job!
2014-01-09 22:01:49 -08:00
Gustavo Cortez e10e5fa2c0 fix link back to blockpage 2014-01-10 02:22:06 -03:00
Gustavo Cortez 145a7208a0 completed readme.md for api prerequisites 2014-01-10 02:14:56 -03:00
Gustavo Cortez d1a62d9c9d Merge branch 'master' into feature/transaction-page 2014-01-10 01:56:54 -03:00
Gustavo Cortez 507de91fe5 Transaction Page: look and feel. Parser and show data from API 2014-01-10 01:55:47 -03:00
Gustavo Maximiliano Cortez d08d456eea Merge pull request #13 from matiu/feature/grunt-enhacements
Enhacements in gruntfile
2014-01-09 15:04:45 -08:00
Matias Alejo Garcia c41446b131 Enhacements in gruntfile 2014-01-09 19:49:48 -03:00
Matias Alejo Garcia 38e93bb341 Merge pull request #12 from colkito/feature/blocklist-page-pagination
Added pagination by date to blocklist page
2014-01-09 14:07:31 -08:00
Mario Colque 9e6db1cc64 Merge pull request #11 from matiu/bug/tx-api-crashing-with-someids
wow!
2014-01-09 13:37:31 -08:00
Mario Colque 279a357f0e Added pagination by date to blocklist page 2014-01-09 18:36:20 -03:00
Matias Alejo Garcia 4de5c5dd00 omit feeds + valueIn in coinbase TXs 2014-01-09 18:35:14 -03:00
Gustavo Maximiliano Cortez f539b0fa74 Merge pull request #10 from matiu/bug/tx-api-crashing-with-someids
fix coinbase TXs in inputs -- it is a fix for show transaction pages
2014-01-09 13:21:03 -08:00
Matias Alejo Garcia 50485ce18e fix coinbase TXs in inputs 2014-01-09 18:18:47 -03:00
Gustavo Maximiliano Cortez e754d12129 Merge pull request #9 from matiu/feature/add-addr-and-values-to-tx-API
Feature/add addr and values to tx api -- It will be use in transaction page
2014-01-09 12:34:11 -08:00
Matias Alejo Garcia 35d5be894f more information added to TX API: values and IN addresses. Test updated 2014-01-09 17:30:29 -03:00
Matias Alejo Garcia 0bf989425a bitcoind diff 2014-01-09 15:40:21 -03:00
Matias Alejo Garcia 7be0bb33e3 Merge pull request #8 from colkito/feature/blocklist-page
Blocklist page and blocklist by date page
2014-01-09 10:24:47 -08:00
Mario Colque aab6121dd0 unnecessary number removed 2014-01-09 15:21:51 -03:00
Mario Colque e7ef5d0e30 Merge branch 'master' into feature/blocklist-page 2014-01-09 15:17:52 -03:00
Mario Colque aa771bf4dd blocks controller improved to find blocks by date 2014-01-09 15:15:30 -03:00
Mario Colque 40bf13eb9c Merge pull request #7 from cmgustavo/feature/front-end-with-angularjs
awesome!
2014-01-09 10:13:14 -08:00
Gustavo Cortez d0874c48cf front-end with angularjs: blockpage and transaction page. Basic information. 2014-01-09 15:13:26 -03:00
Mario Colque 100b901581 reusing the blocklist template. Parsing new model 2014-01-09 14:53:28 -03:00
Matias Alejo Garcia e1f958345e Merge pull request #5 from maraoz/feature/prototype-p2p
p2p handling of inv for blocks and transactions
2014-01-09 08:38:42 -08:00
Gustavo Maximiliano Cortez c1cc2cfb7a Merge pull request #6 from matiu/feature/virtual-methods-to-pull-data-from-bitcoind
Feature/virtual methods to pull data from bitcoind -- Good!
2014-01-09 08:36:48 -08:00
Matias Alejo Garcia 6de5bf3566 add time to block for sorting 2014-01-08 17:45:37 -03:00
Matias Alejo Garcia 451b24d4a8 fix API using the new thin object model 2014-01-08 17:15:46 -03:00
Matias Alejo Garcia 5509e941ba mocha test for transaction 2014-01-08 17:04:45 -03:00
Matias Alejo Garcia 848b485658 simple test for block thin model 2014-01-08 16:46:56 -03:00
Manuel Araoz ec0c78d914 Merge remote-tracking branch 'matiu/feature/virtual-methods-to-pull-data-from-bitcoind' into feature/p2p-import 2014-01-08 16:32:11 -03:00
Matias Alejo Garcia 08f106aa0c testing thin models 2014-01-08 16:29:39 -03:00
Matias Alejo Garcia 5aa508ae8a sync working for the thing version of the models 2014-01-08 14:50:37 -03:00
Manuel Araoz 4cb232e5ca Merge remote-tracking branch 'bitpay/master' into feature/prototype-p2p 2014-01-08 14:31:38 -03:00
Manuel Araoz bf05ff8de1 p2p handling of inv for blocks and transactions 2014-01-08 14:29:52 -03:00