Commit Graph

352 Commits

Author SHA1 Message Date
Manuel Araoz
76273d1c6c Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api 2014-01-20 13:31:57 -03:00
Manuel Araoz
cf5aea1165 socket.io and angular proper integration 2014-01-20 13:31:37 -03:00
Gustavo Maximiliano Cortez
0c76eb6aed Merge pull request #88 from bechi/bug/01block-page
fix block page - great!
2014-01-20 07:41:45 -08:00
Bechi
685b0a277d fix block page 2014-01-20 12:38:51 -03:00
Gustavo Maximiliano Cortez
792eb1a23d Merge pull request #87 from colkito/bug/grunt-nodemon-new-version
grunt-nodemon options updated to the new version -- npm i
2014-01-20 07:34:22 -08:00
Mario Colque
ff0a87c671 grunt-nodemon options updated to the new version 2014-01-20 12:33:01 -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
Gustavo Maximiliano Cortez
441843a25f Merge pull request #86 from matiu/feature/10sync
Feature/10sync -- great!
2014-01-20 05:30:26 -08:00
Matias Alejo Garcia
ed0a8bb0e3 remove unnecesaries dependencies 2014-01-20 10:28:59 -03:00
Matias Alejo Garcia
8898e9b8c5 add error messages to sync status 2014-01-19 21:43:10 -03:00
Matias Alejo Garcia
24e4241b40 MANUAL merge: pull request matiu/09sync 2014-01-19 21:35:31 -03:00
Matias Alejo Garcia
73a1d64e01 README updated 2014-01-19 12:39:34 -03:00
Matias Alejo Garcia
10972fd8dd sync API not emits "sync" thru socket.io 2014-01-19 12:33:39 -03:00
Matias Alejo Garcia
72741f88fb Merge pull request #83 from cmgustavo/feature/03status
refactory: status controller: Great!
2014-01-19 07:15:23 -08:00
Gustavo Cortez
e73064e7ca refactory: no repeat same return function 2014-01-19 11:29:59 -03:00
Matias Alejo Garcia
08a54a40e2 sync API 2014-01-19 10:51:01 -03:00
Gustavo Cortez
027935844a refactory: status controller 2014-01-19 05:30:22 -03:00
Matias Alejo Garcia
4d23191116 better smart syncs 2014-01-18 18:28:24 -03:00
Gustavo Maximiliano Cortez
9db25a988e Merge pull request #82 from colkito/feature/error-pages-not-found
added error messages for bad addresses, txids, blockids
2014-01-17 13:28:59 -08:00
Mario Colque
d7ab549a5e added error messages for bad addresses, txids, blockids 2014-01-17 18:25:48 -03:00
Mario Colque
a12f992bef Merge pull request #81 from cmgustavo/feature/02footer
footer with info from bitcoind. it updates when get new block
2014-01-17 12:55:22 -08: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
Gustavo Maximiliano Cortez
62c5d90b5a Merge pull request #78 from matiu/feature/07sync/uptosync
Feature/07sync/uptosync
2014-01-17 12:12:26 -08:00
Matias Alejo Garcia
dbe5d56279 Merge pull request #80 from bechi/feature/01transaction-page
transaction page
2014-01-17 12:06:43 -08:00
Manuel Araoz
6c7ecef5d4 socket api for address transactions 2014-01-17 16:49:08 -03:00
Matias Alejo Garcia
b02e85c45d fix message 2014-01-17 16:42:07 -03:00
Matias Alejo Garcia
80d3c24755 smart sync. Skips genesisTX 2014-01-17 16:36:34 -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
Manuel Araoz
5fe57077d7 hello world version of address specific socket 2014-01-17 15:25:15 -03:00
Mario Colque
542454e2fc Merge pull request #77 from cmgustavo/feature/03transaction_list
added alert if there are not transactions yet
2014-01-17 07:48:11 -08:00
Gustavo Cortez
6e46d85124 added alert if there are not transactions yet 2014-01-17 12:49:33 -03:00
Gustavo Maximiliano Cortez
b6abe7f338 Merge pull request #76 from colkito/feature/change-mystery-to-insight
rename project to Insight -- great movement!
2014-01-17 07:04:04 -08:00
Mario Colque
4503542518 Merge pull request #75 from cmgustavo/feature/02transaction_list
added reward to list of transactions
2014-01-17 06:55:53 -08:00
Mario Colque
57ec70d88d rename project 2014-01-17 11:46:12 -03:00
Matias Alejo Garcia
82beb27a3c better block_total accounting 2014-01-17 10:44:14 -03:00
Manuel Aráoz
4b1fbf8877 Merge pull request #71 from maraoz/test/test-p2p-sync
testing p2p sync
2014-01-17 05:35:45 -08:00
Manuel Araoz
717b1e930f Merge branch 'master' of github.com:bitpay/mystery into test/test-p2p-sync
Conflicts:
	lib/PeerSync.js
	lib/Sync.js
2014-01-17 10:22:49 -03:00
Matias Alejo Garcia
4442497638 implements uptosync 2014-01-17 10:22:00 -03:00
Gustavo Cortez
81ec0142e6 added reward to list of transactions 2014-01-17 10:12:59 -03:00
Matias Alejo Garcia
6600e941a2 Merge pull request #74 from matiu/feature/fix-jshint
Feature/fix jshint
2014-01-16 18:27:27 -08:00
Matias Alejo Garcia
3affbd43be remove all jshint warns 2014-01-16 23:26:12 -03:00
Matias Alejo Garcia
59a34beda0 fixes jshint warnings. add config for disabling sync 2014-01-16 23:23:10 -03:00
Manuel Araoz
62d469be0c finished tests for PeerSync.js 2014-01-16 21:08:50 -03:00
Mario Colque
a126bdd2f8 Merge pull request #73 from cmgustavo/feature/01transactions_details
Feature/01transactions details
2014-01-16 13:27:13 -08:00
Gustavo Cortez
522d35905a final step: colquito/complete info of transaction list 2014-01-16 18:28:23 -03:00
Mario Colque
6bb19c9ba9 Merge pull request #72 from maraoz/bug/move-socket-file
move socket controller to controllers
2014-01-16 13:26:40 -08:00
Mario Colque
ac35574ab0 Merge pull request #70 from cmgustavo/feature/01contributors
we love you!
2014-01-16 13:25:03 -08:00