Dani Herrero
|
3806e9e591
|
nueva directiva vn-tooltip
|
2017-06-08 09:29:03 +02:00 |
 Joan Sanchez
|
e178bd8676
|
Traducciones de plantillas y mostrar nuevos datos de facturación en servicio mailer.
|
2017-06-07 19:29:16 +02:00 |
|
Joan Sanchez
|
984dc1e908
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-07 15:29:11 +02:00 |
|
Joan Sanchez
|
73c5f5581f
|
Cambios en servicio mailer
|
2017-06-07 15:28:42 +02:00 |
|
Dani Herrero
|
6123278945
|
en progreso: interfaz gráfica
|
2017-06-07 15:03:12 +02:00 |
|
Dani Herrero
|
544c69ecd8
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-07 13:28:03 +02:00 |
|
Dani Herrero
|
51a700b6ce
|
date-picker v1
|
2017-06-07 13:27:57 +02:00 |
Vicente Falco
|
3ffa020564
|
nginx docker
|
2017-06-07 09:09:35 +02:00 |
|
Vicente Falco
|
7ec66e862c
|
nginx
|
2017-06-07 09:07:58 +02:00 |
|
Vicente Falco
|
00dd05ba6d
|
Docker
|
2017-06-07 08:43:25 +02:00 |
nelo
|
97fbc75e05
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-07 08:38:53 +02:00 |
|
nelo
|
ce256b395e
|
tarea gula para copiar los ficheros comunes
puerto 3004 para production
|
2017-06-07 08:38:48 +02:00 |
|
Vicente Falco
|
f38bb2206a
|
merge
|
2017-06-07 07:09:17 +02:00 |
|
Vicente Falco
|
63fe545b75
|
Jenkins
|
2017-06-07 07:08:40 +02:00 |
|
Dani Herrero
|
fd08a6991e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-06 15:02:07 +02:00 |
|
Dani Herrero
|
9eaae2269b
|
client: localizador al 6%
|
2017-06-06 15:02:03 +02:00 |
|
Vicente Falco
|
fb4c0db6c5
|
Jenkins webpack
|
2017-06-06 14:35:31 +02:00 |
|
Vicente Falco
|
298aab3704
|
merge
|
2017-06-06 14:02:04 +02:00 |
|
Vicente Falco
|
be6fa25001
|
Jenkins
|
2017-06-06 14:00:30 +02:00 |
|
Dani Herrero
|
e16ca61e3b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-06 13:06:54 +02:00 |
|
Dani Herrero
|
9fcdb28d14
|
cambio en routes e interfaz localizador al 5%
|
2017-06-06 13:06:47 +02:00 |
|
nelo
|
47f9d29686
|
servicio production creado
|
2017-06-06 08:21:38 +02:00 |
|
Vicente Falco
|
622884d31c
|
Docker nginx
|
2017-06-05 09:22:36 +02:00 |
Juan Ferrer Toribio
|
609c984426
|
Loopback 3, errores solucionados, codigo reorganizado
|
2017-06-05 09:01:21 +02:00 |
|
Juan Ferrer Toribio
|
b427361156
|
Loopback 3, Errores solucionados
|
2017-06-03 13:01:47 +02:00 |
|
Juan Ferrer Toribio
|
8cd312e145
|
Errores solucionados
|
2017-06-02 15:39:16 +02:00 |
|
Juan Ferrer Toribio
|
02d0e167a0
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-02 15:23:30 +02:00 |
|
Juan Ferrer Toribio
|
f9842000d3
|
Codigo gulp reorganizado, errores redirección solucionados
|
2017-06-02 15:23:19 +02:00 |
 Javi Gallego
|
64dea096e0
|
test cambio https
|
2017-06-02 14:17:57 +02:00 |
|
Juan Ferrer Toribio
|
481a2219ce
|
Ruta desarrollo http://localhost:5000, producción 80
|
2017-06-02 09:29:14 +02:00 |
|
Juan Ferrer Toribio
|
80e6b0c666
|
Merge
|
2017-06-01 18:48:11 +02:00 |
|
Juan Ferrer Toribio
|
61829e1ae4
|
Validación credito beta
|
2017-06-01 18:23:41 +02:00 |
|
Dani Herrero
|
bb91c026da
|
corregido error aviso cambio de método pago
|
2017-06-01 14:50:55 +02:00 |
|
nelo
|
60de6056c1
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-01 14:39:26 +02:00 |
|
nelo
|
b18c2c4966
|
Administración solo recargo equivalencia
Razón social único
Si no hay comercial, modificar los datos
|
2017-06-01 14:39:22 +02:00 |
|
Dani Herrero
|
55a66c992c
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-01 14:05:31 +02:00 |
|
Dani Herrero
|
310ad81a69
|
emails separados con coma
|
2017-06-01 14:05:23 +02:00 |
|
Vicente Falco
|
f4ed484b90
|
Notas: Anadir usuario
|
2017-06-01 13:52:13 +02:00 |
|
Dani Herrero
|
fb8e62c840
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-01 13:31:47 +02:00 |
|
Dani Herrero
|
cd750cb86f
|
ACL corregido error
|
2017-06-01 13:31:42 +02:00 |
|
Juan Ferrer Toribio
|
f018b3d958
|
Errores al arrancar nginx por primera vez
|
2017-06-01 11:16:33 +02:00 |
|
Juan Ferrer Toribio
|
2ac41f390a
|
Carpetas renombradas, plantillas configuración
|
2017-06-01 09:58:24 +02:00 |
|
Dani Herrero
|
0cc64bf285
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-01 09:32:01 +02:00 |
|
Dani Herrero
|
a3dda662ae
|
ACLs, json configuracion y script SQL
|
2017-06-01 09:31:57 +02:00 |
|
Joan Sanchez
|
bb75fd783c
|
merge
|
2017-06-01 08:52:25 +02:00 |
|
Joan Sanchez
|
c9968cf550
|
Eliminado logger y renombradas carpetas
|
2017-06-01 08:51:29 +02:00 |
|
Dani Herrero
|
cf9e2f3d14
|
arreglado fallo al actualizar el consignatario predeterminado
|
2017-06-01 08:44:37 +02:00 |
|
Dani Herrero
|
dd9ec548e1
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-06-01 08:29:15 +02:00 |
|
Dani Herrero
|
8815b927ac
|
merge solved conflicts
|
2017-06-01 08:29:01 +02:00 |
|
Juan Ferrer Toribio
|
410f0490c6
|
Errores solucionados
|
2017-06-01 08:28:52 +02:00 |