nelo
|
011d9d7dc9
|
integración customer
|
2016-11-09 14:09:12 +01:00 |
|
nelo
|
afffc2f8a8
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
# @salix-services/salix/client/index.ejs
# @salix/error.log
# myToken.json
|
2016-11-09 13:15:35 +01:00 |
|
nelo
|
d79dda5f9e
|
Añadido customer
|
2016-11-09 13:12:59 +01:00 |
Juan Ferrer Toribio
|
86001a1e8e
|
Fallos de rutas solucionados
|
2016-11-09 13:10:56 +01:00 |
|
Juan Ferrer Toribio
|
daf556d490
|
Archivo generado borrado
|
2016-11-09 12:46:29 +01:00 |
|
Juan Ferrer Toribio
|
37673ea3ab
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-09 12:42:41 +01:00 |
|
Juan Ferrer Toribio
|
2834684306
|
Archivos reorganizados, configuración nginx
|
2016-11-09 12:42:37 +01:00 |
SAMBA\vfalco
|
852fe34c6f
|
forever
|
2016-11-09 09:58:50 +01:00 |
|
SAMBA\vfalco
|
3a61450784
|
Balanceador Nginx
|
2016-11-08 15:23:53 +01:00 |
|
SAMBA\vfalco
|
a1cbb72198
|
nginx
|
2016-11-08 15:06:45 +01:00 |
 Javi Gallego
|
498d806f69
|
json dinamico
|
2016-11-08 09:27:41 +01:00 |
|
SAMBA\vfalco
|
9474ec6f46
|
login
|
2016-11-08 09:11:58 +01:00 |
|
SAMBA\vfalco
|
63781ba7e2
|
login
|
2016-11-08 09:07:39 +01:00 |
|
Javi Gallego
|
e1953d1f3e
|
app con gestion de cookie
|
2016-11-07 11:20:04 +01:00 |
|
SAMBA\vfalco
|
fb904dadd3
|
Microservice login
|
2016-11-07 10:06:28 +01:00 |
|
Javi Gallego
|
0840f59a64
|
reorganizacion de directorios
|
2016-11-04 11:32:27 +01:00 |
|
Juan Ferrer Toribio
|
5bb13af69d
|
Login como modulo aparte
|
2016-11-04 11:03:40 +01:00 |
|
Javi Gallego
|
e1374fdd3f
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-04 09:15:02 +01:00 |
|
Javi Gallego
|
479796ef6a
|
creacion de la carpeta salix-services
|
2016-11-04 09:13:40 +01:00 |
|
Juan Ferrer Toribio
|
afd7877d7d
|
Componente login
|
2016-11-03 15:37:18 +01:00 |
|
Juan Ferrer Toribio
|
8d147f0c5f
|
Componente login
|
2016-11-03 15:36:33 +01:00 |
|
Juan Ferrer Toribio
|
11102f0d5d
|
Debugs eliminados
|
2016-10-21 08:42:03 +02:00 |
|
Juan Ferrer Toribio
|
8905d685f7
|
Rutas y splitings generados automaticamente
|
2016-10-21 08:38:58 +02:00 |
|
Juan Ferrer Toribio
|
9f7be0dbbe
|
Errores al generar rutas solucionados
|
2016-10-18 10:36:16 +02:00 |
|
Juan Ferrer Toribio
|
d9bfd1b579
|
Concatenar rutas con Gulp
|
2016-10-10 11:15:05 +02:00 |
|
nelo
|
301588e0ed
|
Prueba concepto rutas
|
2016-10-07 12:51:31 +02:00 |
|
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 |