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
|
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 |
|
Juan Ferrer Toribio
|
94bdcd66e7
|
Errores solucionados
|
2017-06-01 08:28:12 +02:00 |
|
Dani Herrero
|
b9c43ec961
|
fixed pass
|
2017-06-01 08:26:48 +02:00 |
|
Juan Ferrer Toribio
|
5507c84670
|
Errores solucionados
|
2017-06-01 08:25:59 +02:00 |
|
Juan Ferrer Toribio
|
7f661afa1a
|
Errores solucionados
|
2017-06-01 08:24:57 +02:00 |
|
Dani Herrero
|
6dcf37fc5a
|
logger fixed
|
2017-06-01 08:20:05 +02:00 |
|
Dani Herrero
|
36a5051634
|
arreglos en merge 2
|
2017-06-01 08:01:49 +02:00 |
|
Dani Herrero
|
342ca3bd30
|
arreglos de conflictos
|
2017-06-01 07:59:41 +02:00 |
|
Dani Herrero
|
25bac942a3
|
merge
|
2017-06-01 07:10:28 +02:00 |
|
Juan Ferrer Toribio
|
0c82c83ca3
|
Errores solucionados, configuración mailer, eslint
|
2017-05-31 18:19:55 +02:00 |
|
Joan Sanchez
|
b2c5fe8a28
|
dependencia path
|
2017-05-31 14:59:05 +02:00 |
|
Joan Sanchez
|
a4d8574321
|
Cambios en servicio mailer
|
2017-05-31 14:55:41 +02:00 |
|
Joan Sanchez
|
552559adaa
|
Service mailer, plantillas y traducciones
|
2017-05-31 13:46:18 +02:00 |
Vicente Falco
|
f2e5b4824e
|
merge
|
2017-05-31 13:00:16 +02:00 |
|
Vicente Falco
|
3acca753bb
|
merge
|
2017-05-31 13:00:16 +02:00 |
|
Vicente Falco
|
89c90b0af2
|
merge
|
2017-05-31 12:57:18 +02:00 |
|
Vicente Falco
|
fae56408bb
|
merge
|
2017-05-31 12:57:18 +02:00 |
|
Dani Herrero
|
96dd6de8a6
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-31 12:56:42 +02:00 |
|
Dani Herrero
|
72d5e3e0a3
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-31 12:56:42 +02:00 |
|
Dani Herrero
|
b8287efdc2
|
kanban: asociar envío escrito con cambio de valor
|
2017-05-31 12:56:37 +02:00 |
|
Dani Herrero
|
528dcac06f
|
kanban: asociar envío escrito con cambio de valor
|
2017-05-31 12:56:37 +02:00 |
nelo
|
c8424f98f4
|
paginación en clientes
arreglado problema de búsqueda
|
2017-05-31 10:58:48 +02:00 |
|
nelo
|
9e550e746a
|
paginación en clientes
arreglado problema de búsqueda
|
2017-05-31 10:58:48 +02:00 |
|
Dani Herrero
|
11c3b2de2d
|
renombrado de archivos parte 1
|
2017-05-31 09:46:05 +02:00 |
|
Dani Herrero
|
9cea151f4d
|
renombrado de archivos parte 1
|
2017-05-31 09:46:05 +02:00 |
|
Dani Herrero
|
74a0eedb47
|
Añadidos ACLs del servicio client
|
2017-05-30 14:17:01 +02:00 |
|
Dani Herrero
|
cadbb2b6c2
|
Añadidos ACLs del servicio client
|
2017-05-30 14:17:01 +02:00 |
|
Vicente Falco
|
2dab567b98
|
gulp services y service mailer
|
2017-05-30 08:50:16 +02:00 |
|
Vicente Falco
|
65cc23b280
|
gulp services y service mailer
|
2017-05-30 08:50:16 +02:00 |
|
Joan Sanchez
|
04aadb76a2
|
Service mailer
|
2017-05-30 08:06:14 +02:00 |
|
Joan Sanchez
|
609c13efbf
|
Service mailer
|
2017-05-30 08:06:14 +02:00 |
|
Vicente Falco
|
3d43bf57cd
|
mailer docker
|
2017-05-29 13:57:18 +02:00 |
|
Vicente Falco
|
0ad4558c17
|
nginx
|
2017-05-29 13:48:20 +02:00 |
|
Juan Ferrer Toribio
|
025bd4224e
|
Errores en validación solucionados
|
2017-05-26 17:05:33 +02:00 |
|
Juan Ferrer Toribio
|
daaf73a143
|
Errores validacion solucionados
|
2017-05-26 14:44:56 +02:00 |
|
Juan Ferrer Toribio
|
64813b3fd3
|
Errores en validación solucionados
|
2017-05-26 14:39:59 +02:00 |
|
Juan Ferrer Toribio
|
3d71f454a0
|
Errores en validación IBAN solucionados
|
2017-05-26 14:39:36 +02:00 |
|
Vicente Falco
|
51f112fc02
|
Validar campos loopback diferentes modelos
|
2017-05-26 14:06:21 +02:00 |
|
Dani Herrero
|
571692f4ca
|
Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl
|
2017-05-25 14:23:19 +02:00 |
|
Juan Ferrer Toribio
|
041be5ec93
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-25 12:52:49 +02:00 |