Commit Graph

246 Commits

Author SHA1 Message Date
Manuel Aráoz
f2aa5ecc1f Merge pull request #55 from colkito/bug/add-contributor
added contributor to package.json
2014-01-15 11:29:36 -08:00
Mario Colque
9e10537a51 added contributor 2014-01-15 16:25:47 -03:00
Manuel Aráoz
579dbd4622 Merge pull request #54 from maraoz/bug/fixing-some-things
jshint fixes
2014-01-15 11:08:06 -08:00
Manuel Araoz
1ef9cd1f22 jshint fixes 2014-01-15 16:05:26 -03:00
Manuel Aráoz
9cc5b2e1d7 Merge pull request #53 from maraoz/feature/human-readable-times
Feature/human readable times
2014-01-15 10:49:59 -08: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
Mario Colque
f43468fdff Merge pull request #50 from maraoz/feature/add-sinonjs
added sinon and basic test
2014-01-15 09:38:03 -08: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
Manuel Araoz
241ad17807 Merge branch 'master' of github.com:bitpay/mystery into feature/human-readable-times 2014-01-15 14:35:47 -03:00
Manuel Araoz
8e561b8760 Merge branch 'master' of github.com:bitpay/mystery into feature/human-readable-times 2014-01-15 14:34:26 -03: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
54b38f45c8 removed unnecessary var 2014-01-15 13:09:57 -03:00
Mario Colque
3d22ae49be removed unnecessary service 2014-01-15 13:07:07 -03:00
Mario Colque
bce4813248 added new service for transactions 2014-01-15 13:00:02 -03:00
Manuel Araoz
e59a7b0a0b added sinon and basic test 2014-01-15 12:53:44 -03:00
Mario Colque
26b0cdc7e4 added sort 2014-01-15 12:50:55 -03:00
Mario Colque
908e8410dd added limit to index 2014-01-15 12:44:17 -03:00
Mario Colque
950ffe01e6 added limit to find 2014-01-15 12:41:59 -03:00
Mario Colque
0d09aaec51 added init for controller 2014-01-15 12:40:24 -03:00
Mario Colque
2cd3b907a1 added new route for transactions 2014-01-15 12:39:45 -03:00
Manuel Araoz
f7d5452df4 add moment.js to htmls 2014-01-15 11:37:02 -03:00
Manuel Araoz
a06754e25f added moment.js 2014-01-15 11:30:38 -03:00
Matias Alejo Garcia
fad7cb73aa Merge pull request #46 from cmgustavo/feature/get_async_transactions
Feature/get async transactions
2014-01-15 05:42:45 -08:00
Manuel Aráoz
cbee62ccae Merge pull request #49 from maraoz/feature/tx-timestamps
adding timestamps to Transactions
2014-01-15 05:42:37 -08:00
Gustavo Cortez
5c14cceb9e fix conflic in readme.md 2014-01-15 10:40:23 -03:00
Gustavo Cortez
66a5896da2 updated readme.md 2014-01-15 10:38:00 -03:00
Bechi
5c31a92932 Merge branch 'master' into feature/header 2014-01-15 10:34:45 -03:00
Gustavo Cortez
0cabaf6de9 loading message before finish async request 2014-01-15 10:34:25 -03:00
Manuel Araoz
89add704c6 adding timestamps to Transactions 2014-01-15 10:32:18 -03:00
Gustavo Cortez
dc6e64f8bc fix url for get transactions 2014-01-15 10:22:07 -03:00
Bechi
726dc5b0b2 csd 2014-01-15 10:21:28 -03:00
Matias Alejo Garcia
e843ebfe2b Merge pull request #48 from matiu/feature/remove-backend-grunt-error
remove some jslint errors from backend
2014-01-15 05:15:00 -08:00
Matias Alejo Garcia
a1b4fd7ff8 remove some jslint errors from backend 2014-01-15 10:13:46 -03:00
Manuel Aráoz
b2425d2af6 Merge pull request #47 from maraoz/feature/update-README-sockets
update README for websocket API
2014-01-15 04:40:45 -08:00
Manuel Araoz
707e47e403 update README for websocket API 2014-01-15 09:38:27 -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
Matias Alejo Garcia
162e989b65 Merge pull request #45 from maraoz/feature/stream-blocks
show new blocks in homepage < Nice!
2014-01-14 14:49:13 -08:00
Manuel Araoz
b6f4aa78bc show new blocks in homepage 2014-01-14 19:42:38 -03:00
Mario Colque
fd90910fc5 Merge pull request #44 from matiu/bug/04sync
limit concurrency
2014-01-14 13:16:10 -08:00
Matias Alejo Garcia
c3e1250fde limit concurrency 2014-01-14 18:15:02 -03:00
Matias Alejo Garcia
82cddd9dd0 Merge pull request #39 from colkito/feature/no-blocks-message
added a message for no blocks in blocklist page
2014-01-14 13:12:00 -08:00
Manuel Aráoz
366c02bbac Merge pull request #42 from maraoz/bug/remove-files
remove old file
2014-01-14 13:06:09 -08:00
Manuel Araoz
6b374e92da remove old file 2014-01-14 18:03:18 -03:00
Manuel Aráoz
111e3d12ef Merge pull request #41 from maraoz/feature/stream-new-txs
new transactions shown on homepage via socket.io
2014-01-14 12:53:46 -08:00
Manuel Araoz
2e0bd4c660 Merge branch 'master' of github.com:bitpay/mystery into feature/stream-new-txs
Conflicts:
	lib/Sync.js
2014-01-14 17:25:04 -03:00
Manuel Araoz
cc7c876247 new transactions shown on homepage! 2014-01-14 16:56:02 -03:00
Mario Colque
d816447fda Merge pull request #40 from matiu/bug/02sync
MAGICAL!
2014-01-14 11:48:21 -08:00