Commit Graph

384 Commits

Author SHA1 Message Date
Matias Alejo Garcia 0b696e430f Merge pull request #98 from martindale/easy-install
Move external dependencies into package.json.
2014-01-20 19:08:57 -08:00
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
Eric Martindale c41d2f1b95 Move external dependencies into package.json. 2014-01-21 00:26:28 +00:00
Matias Alejo Garcia 0dfaec73db simple versions of vin vout for displaying 2014-01-20 18:57:50 -03:00
Manuel Aráoz b9fb7b235f Merge pull request #95 from bitpay/feature/improve-readability
remove old style angular module def
2014-01-20 13:13:37 -08:00
Matias Alejo Garcia aab8ac2e29 add scripts to tx 2014-01-20 18:11:50 -03:00
Manuel Araoz e45c1ef2bd remove old style angular module def 2014-01-20 18:09:18 -03:00
Matias Alejo Garcia 0c10fd35ea fix layouts problems in tx 2014-01-20 17:51:13 -03:00
Manuel Aráoz e3ccb18b57 Merge pull request #94 from maraoz/feature/tx-sound
Feature/tx sound
2014-01-20 12:42:52 -08: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 f7fce1af7d remove old sound 2014-01-20 17:34:59 -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 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 465e4698f6 more error handling 2014-01-20 16:40:20 -03:00
Matias Alejo Garcia f619192708 better error API handling 2014-01-20 16:11:35 -03:00
Matias Alejo Garcia 4e1562ce7a fix HTTP reponse codes 2014-01-20 15:51:23 -03:00
Manuel Aráoz 48ff0bc2b1 Merge pull request #91 from maraoz/bug/address-timestamp
Bug/address timestamp
2014-01-20 10:48:23 -08:00
Matias Alejo Garcia b4936fd6b4 fix skipping during syc 2014-01-20 15:41:22 -03:00
Manuel Araoz 6bd6019007 Merge branch 'master' of github.com:bitpay/insight into bug/address-timestamp 2014-01-20 15:39:11 -03:00
Manuel Araoz 914671e352 show timestamp for unconfirmed transactions 2014-01-20 15:37:44 -03:00
Bechi 6efbede361 fix transaction list 2014-01-20 15:31:02 -03:00
Manuel Aráoz bf03c951c7 Merge pull request #89 from maraoz/feature/address-socket-api
Feature/address socket api
2014-01-20 09:47:09 -08: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 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
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
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