Mario Colque
|
50dae263b7
|
conflict solved
|
2014-01-08 12:23:25 -03:00 |
|
Mario Colque
|
c967df577e
|
added new blocklist page
|
2014-01-08 11:56:36 -03:00 |
Gustavo Cortez
|
92054210a8
|
block page draft
|
2014-01-08 11:05:19 -03:00 |
|
Gustavo Cortez
|
c2bbdb2941
|
For blocks info, we always use controller blocks. Index controller only render homepage
|
2014-01-08 09:17:41 -03:00 |
|
Gustavo Cortez
|
76862dc0f9
|
Merge branch 'master' into feature/blockpage
Conflicts:
app/models/Block.js
config/routes.js
Fixed!
|
2014-01-08 09:05:08 -03:00 |
Matias Alejo Garcia
|
7002363841
|
TX API working + sync
|
2014-01-08 01:47:20 -03:00 |
|
Gustavo Cortez
|
52f0120f39
|
get block in angular from node!
|
2014-01-07 18:12:37 -03:00 |
|
Matias Alejo Garcia
|
9feb87ddf2
|
API for blocks v0.1 working!
|
2014-01-07 09:48:31 -03:00 |
|
Mario Colque
|
e33ee06cc6
|
using two spaces for tabs
|
2014-01-06 14:37:32 -03:00 |
|
Gustavo Cortez
|
da455b4964
|
added mongo dependency. basic skel
|
2014-01-06 13:33:58 -03:00 |