Commit Graph

174 Commits

Author SHA1 Message Date
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
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 aabc1af9a8 Merge branch 'bug/missing-height-in-block' of https://github.com/matiu/mystery into feature/blockpage 2014-01-08 09:58:57 -03:00
Matias Alejo Garcia 6aa680ef08 adds heights to block 2014-01-08 09:47:12 -03:00
Gustavo Cortez 1ec2984bab Frontend: Blocks controller for angularjs 2014-01-08 09:32:38 -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
Matias Alejo Garcia ca28ed62b4 transaction syncing working! 2014-01-08 01:37:29 -03:00
Matias Alejo Garcia 1063af6f90 fix bug in drop DBs + Transation with many fields in mongo 2014-01-07 21:03:48 -03:00
Gustavo Cortez 52f0120f39 get block in angular from node! 2014-01-07 18:12:37 -03:00
Matias Alejo Garcia 34cff77e42 transaction exploding from blocks 2014-01-07 16:49:42 -03:00
Matias Alejo Garcia 9feb87ddf2 API for blocks v0.1 working! 2014-01-07 09:48:31 -03:00
Matias Alejo Garcia 4425b43f2f sync for blocks 2014-01-07 00:19:12 -03:00
Matias Alejo Garcia e79e81fe4b block syncing working! 2014-01-06 23:50:29 -03:00
Gustavo Cortez cf1deca94f angular js supported! 2014-01-06 17:34:25 -03:00
Gustavo Cortez 3eb96a4cea fix conflicts 2014-01-06 16:16:49 -03:00
Gustavo Cortez 0341f8f691 bootstrap ready! 2014-01-06 16:12:14 -03:00
Matias Alejo Garcia 91ea1d23bc index page 2014-01-06 15:00:28 -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