Commit Graph

10 Commits

Author SHA1 Message Date
Javi Gallego e4808007b7 customer merge 2016-10-07 12:08:26 +02:00
nelo 0bfbc5e064 Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
#	@salix/app/src/routes.js
#	@salix/compras/index.js
#	@salix/crud/src/crud.js
2016-10-07 11:48:49 +02:00
nelo 8c88988ebf calculo de modelos dependientes de manera asíncrona 2016-10-07 11:45:37 +02:00
Javi Gallego 1281e4ea39 prueba eslint 2016-10-07 10:13:03 +02:00
Javi Gallego 36dbfbfbc6 merge routes.js 2016-10-06 15:30:19 +02:00
Javi Gallego 9995d815f9 crud add 2016-10-06 15:27:02 +02:00
nelo 616835b454 GraphDependecies 2016-10-06 15:16:42 +02:00
nelo 9d5885777a montado el ui-router con oclazyload 2016-10-06 07:59:39 +02:00
nelo f42d6273eb integración oclazyload y ui router 2016-10-05 15:19:28 +02:00
PedroHurtado 3f36562dae Spliting de modulos con require.ensure 2016-10-05 07:55:53 +02:00