nelo
|
54c91c3d9e
|
Arreglo merge
|
2016-10-07 12:10:24 +02:00 |
 Javi Gallego
|
e4808007b7
|
customer merge
|
2016-10-07 12:08:26 +02:00 |
|
Javi Gallego
|
af097fde31
|
customer-list
|
2016-10-07 11:56:48 +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 |
Juan Ferrer Toribio
|
5a4a41d630
|
Concat de rutas JS con Gulp, servidor express sirve routes.js
|
2016-10-07 11:44:24 +02:00 |
|
Javi Gallego
|
1281e4ea39
|
prueba eslint
|
2016-10-07 10:13:03 +02:00 |
|
Juan Ferrer Toribio
|
9fb4b55c6b
|
Merge
|
2016-10-06 15:34:39 +02:00 |
|
Juan Ferrer Toribio
|
86a19c47ee
|
CORS en servidor express, cargador de rutas
|
2016-10-06 15:32: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
|
4d6ad1a910
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-10-06 15:17:12 +02:00 |
|
nelo
|
616835b454
|
GraphDependecies
|
2016-10-06 15:16:42 +02:00 |
|
Juan Ferrer Toribio
|
d94bfa0adc
|
Servidor HTTP con express que sirve el archivo de rutas
|
2016-10-06 12:16:07 +02:00 |
|
Juan Ferrer Toribio
|
5a5820328c
|
Merge
|
2016-10-06 11:23:54 +02:00 |
|
Juan Ferrer Toribio
|
287fd05864
|
Concatena JSON de rutas usando Gulp
|
2016-10-06 11:18:02 +02:00 |
jgallego
|
750845b9fe
|
merge index
|
2016-10-06 10:21:59 +02:00 |
|
jgallego
|
fc2d75ddc3
|
css con webpack
|
2016-10-06 09:20:57 +02:00 |
|
nelo
|
9d5885777a
|
montado el ui-router con oclazyload
|
2016-10-06 07:59:39 +02:00 |
|
jgallego
|
755a9c936a
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-10-06 07:45:31 +02:00 |
|
jgallego
|
de3a289580
|
cambio de txt por label
|
2016-10-06 07:44:20 +02:00 |
|
nelo
|
cee4fb2bcd
|
cambios en la versión de los paquetes para:
angular v1.5.8
ui-router v1.0.0-beta.3
|
2016-10-06 07:44:13 +02:00 |
|
nelo
|
5c9f7fd04e
|
merge bien hecho
|
2016-10-05 15:22:10 +02:00 |
|
nelo
|
00c8fb455f
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
# index.html
|
2016-10-05 15:20:59 +02:00 |
|
nelo
|
f42d6273eb
|
integración oclazyload y ui router
|
2016-10-05 15:19:28 +02:00 |
|
jgallego
|
f1a3e2dd58
|
componentes basicos con prueba basica
|
2016-10-05 15:13:28 +02:00 |
PedroHurtado
|
d1a86633fc
|
Merge II
|
2016-10-05 08:08:36 +02:00 |
|
PedroHurtado
|
4a05f021b6
|
Merge
|
2016-10-05 08:03:43 +02:00 |
|
PedroHurtado
|
3f36562dae
|
Spliting de modulos con require.ensure
|
2016-10-05 07:55:53 +02:00 |
|
Juan Ferrer Toribio
|
123932ba64
|
Chunk vendor eliminado
|
2016-09-29 15:12:20 +02:00 |
|
jgallego
|
aa85fade20
|
Plantilla proyecto inicial
|
2016-09-29 11:04:11 +02:00 |
|
Juan Ferrer Toribio
|
ee100502df
|
Añadido raw loader para hacer require de plantillas HTML, archivos js obsoletos de componentes borrados
|
2016-09-29 07:28:56 +02:00 |
|
Juan Ferrer Toribio
|
8332027bf9
|
Initial commit
|
2016-09-29 07:10:58 +02:00 |