nelo
|
729ddf3358
|
warehouses inventory
|
2017-06-20 10:40:04 +02:00 |
nelo
|
80b9815a57
|
callback error list warehouses, change-state
|
2017-06-15 11:59:15 +02:00 |
nelo
|
b86f71bb25
|
llamamos al servicio client para obtener el empleado
cambiamos el estado
|
2017-06-15 11:02:50 +02:00 |
nelo
|
18ff74b17f
|
get user and employee
|
2017-06-14 14:27:16 +02:00 |
nelo
|
6996352029
|
get warehouses
|
2017-06-14 12:55:10 +02:00 |
nelo
|
16302e1f9a
|
problemas con riesgo
|
2017-06-14 12:16:53 +02:00 |
Dani Herrero
|
888f5c0cc6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-14 09:58:36 +02:00 |
Dani Herrero
|
e43827ab28
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
# Conflicts:
# services/production/common/methods/ticket-state/change-state.js
|
2017-06-14 09:58:30 +02:00 |
nelo
|
956264a529
|
fake son con notas
|
2017-06-14 09:56:08 +02:00 |
Dani Herrero
|
afff93cce6
|
Tooltip: admite html, Localizador: añadido icono con información adicional
|
2017-06-14 09:54:00 +02:00 |
nelo
|
3da67266bb
|
promesa para obtener usuario
|
2017-06-14 08:54:45 +02:00 |
nelo
|
6adc734f69
|
change state ticket
|
2017-06-13 13:57:40 +02:00 |
nelo
|
87857488c0
|
modificaciones fake son
|
2017-06-13 12:00:11 +02:00 |
nelo
|
cbc364db38
|
get states production
|
2017-06-13 11:26:54 +02:00 |
nelo
|
ecf347e7e2
|
modificaciones fake
|
2017-06-13 09:07:14 +02:00 |
nelo
|
c24c126734
|
fake son de tickets
my model tiene el meted raw sql
|
2017-06-13 08:44:40 +02:00 |
Joan Sanchez
|
e4f9420697
|
Parser de estilos en plantillas para el servicio mailer.
|
2017-06-12 13:41:02 +02:00 |
Joan Sanchez
|
9aa549cfc5
|
No mostrar dia de pago en metodo de pago por tarjeta.
|
2017-06-08 16:53:10 +02:00 |
Vicente Falco
|
dbb1632632
|
nginx docker
|
2017-06-08 11:08:45 +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
|
73c5f5581f
|
Cambios en servicio mailer
|
2017-06-07 15:28:42 +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
|
ce256b395e
|
tarea gula para copiar los ficheros comunes
puerto 3004 para production
|
2017-06-07 08:38:48 +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
|
f9842000d3
|
Codigo gulp reorganizado, errores redirección solucionados
|
2017-06-02 15:23:19 +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 |
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
|
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 |
Juan Ferrer Toribio
|
1482b842bd
|
Errores solucionados
|
2017-05-25 12:52:38 +02:00 |
Dani Herrero
|
81f9de098d
|
ACLs , permisos a nivel de rutas, menu y componentes
|
2017-05-25 11:48:10 +02:00 |
Dani Herrero
|
3c54a222b9
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-25 07:21:43 +02:00 |
Dani Herrero
|
2ab756a403
|
primera version de ACL
|
2017-05-25 07:21:36 +02:00 |
Juan Ferrer Toribio
|
345f2e55a5
|
vnAutocomplete: Acepta plantillas
|
2017-05-24 13:24:32 +02:00 |
Juan Ferrer Toribio
|
5b9fcf868a
|
401 redirecciona a login, vnAutocomplete: campos seleccionados
|
2017-05-23 14:05:26 +02:00 |
Juan Ferrer Toribio
|
aabc190c08
|
crlf -> lf
|
2017-05-22 12:39:36 +02:00 |
Dani Herrero
|
4857fce33e
|
Añadido logoutSessionsOnSensitiveChanges
|
2017-05-22 12:33:06 +02:00 |
Juan Ferrer Toribio
|
3f84230619
|
Autenticación por email o usuario
|
2017-05-22 11:31:06 +02:00 |
Juan Ferrer Toribio
|
ac3f7c2da0
|
Autenticación: errores solucionados
|
2017-05-22 11:04:37 +02:00 |
Juan Ferrer Toribio
|
5cfdd51cf4
|
Integración usuarios, errores solucionados
|
2017-05-21 18:36:07 +02:00 |
Juan Ferrer Toribio
|
72415ebeb2
|
ACLs
|
2017-05-18 17:54:23 +02:00 |
Juan Ferrer Toribio
|
c4cb0906ad
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-18 17:35:51 +02:00 |
Juan Ferrer Toribio
|
a2ac778c9a
|
Peticiones XHR con token
|
2017-05-18 17:35:07 +02:00 |
nelo
|
a031f31a05
|
restablecido filtre
|
2017-05-18 13:59:02 +02:00 |
nelo
|
7691449e52
|
restablecido filtre
|
2017-05-18 13:40:42 +02:00 |
nelo
|
5e965f485f
|
eliminado el filter de MyModel
|
2017-05-18 11:55:46 +02:00 |
nelo
|
b4d167bbb7
|
header.js
|
2017-05-18 11:54:39 +02:00 |
nelo
|
2aa7c9731d
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-18 08:18:53 +02:00 |
Juan Ferrer Toribio
|
2c7a37c4b6
|
Errores solucionados, modelos loopback ocultados
|
2017-05-17 21:38:02 +02:00 |
Juan Ferrer Toribio
|
9d4acfc64f
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-17 21:23:54 +02:00 |
Juan Ferrer Toribio
|
4eff9d451b
|
Autenticación por token
|
2017-05-17 21:23:47 +02:00 |
nelo
|
726bb73ca0
|
Todos heredan de MyModel
|
2017-05-17 14:58:23 +02:00 |
Vicente Falco
|
5f9160c172
|
ng-disabled vn-textfield
|
2017-05-17 14:04:02 +02:00 |
nelo
|
e4559c3959
|
Corrección error autocomplete
Separado meted activate
Separado meted addresses
|
2017-05-17 09:45:34 +02:00 |
nelo
|
ae3f9db948
|
VnAutocomplete ya no carga los datos cuando los datos se pueden bandera.
Creado el método card en client para listar el cliente con sus datos para el combo.
|
2017-05-17 08:19:03 +02:00 |
Vicente Falco
|
fc37c59574
|
nginx
|
2017-05-15 11:12:00 +02:00 |
Vicente Falco
|
d8df17ad07
|
salix routes static
|
2017-05-15 10:44:19 +02:00 |
Vicente Falco
|
eacd133d00
|
Docker nginx
|
2017-05-15 09:03:05 +02:00 |
Vicente Falco
|
6a4235a9a2
|
Ajustes conf
|
2017-05-15 08:47:58 +02:00 |
Vicente Falco
|
77d8a8f090
|
Jenkins
|
2017-05-15 08:33:51 +02:00 |
Vicente Falco
|
8a9d8c83b6
|
docker
|
2017-05-15 08:07:30 +02:00 |
Vicente Falco
|
8c47938bd0
|
merge
|
2017-05-15 07:53:40 +02:00 |
Vicente Falco
|
d5da337d52
|
Jenkins - docker nginx
|
2017-05-15 07:53:06 +02:00 |
Juan Ferrer Toribio
|
60a3b049de
|
Campos renombrados
|
2017-05-12 15:21:37 +02:00 |
Juan Ferrer Toribio
|
88992438e2
|
Errores solucionados
|
2017-05-12 13:58:08 +02:00 |
Juan Ferrer Toribio
|
34e0537b64
|
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
|
2017-05-12 13:36:56 +02:00 |
Juan Ferrer Toribio
|
ebb59d1eef
|
Errores en relaciones solucionados
|
2017-05-12 13:36:12 +02:00 |
Vicente Falco
|
a9212721f1
|
docker nginx conf
|
2017-05-12 13:14:52 +02:00 |
Vicente Falco
|
4df1a7898c
|
Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev
|
2017-05-12 13:05:54 +02:00 |
Vicente Falco
|
d93c6e1885
|
Jenkins - Docker
|
2017-05-12 12:41:35 +02:00 |
nelo
|
89f397da2c
|
Arreglado ClientObservation
|
2017-05-12 11:20:32 +02:00 |
Juan Ferrer Toribio
|
b7fb0bca98
|
Relaciones arregladas
|
2017-05-12 11:14:55 +02:00 |
nelo
|
8ce3325f06
|
Renombrado Chanel a ContactChannel
|
2017-05-11 14:19:43 +02:00 |
nelo
|
495e3b7c5e
|
creado el modelo Chanel.
Se puede seleccionar en el cliente.
|
2017-05-11 13:01:33 +02:00 |
Vicente Falco
|
27d086843f
|
Jenkins - Docker
|
2017-05-11 12:07:33 +02:00 |
Juan Ferrer Toribio
|
85184d71eb
|
Modelo modificado
|
2017-05-10 17:18:25 +02:00 |
Juan Ferrer Toribio
|
0efdd3565e
|
Modelos loopback
|
2017-05-09 14:04:44 +02:00 |
Juan Ferrer Toribio
|
0da217e9bc
|
Errores solucionados
|
2017-05-05 13:32:07 +02:00 |
Juan Ferrer Toribio
|
f7ec186a77
|
Errores solucionados
|
2017-05-05 12:54:47 +02:00 |
Juan Ferrer Toribio
|
f8cd8ee776
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-04-28 15:04:36 +02:00 |
Juan Ferrer Toribio
|
ce2d7936af
|
Integración con MySQL, errores solucionados
|
2017-04-28 15:04:29 +02:00 |
Vicente Falco
|
0cf11ceff0
|
i18n loopback client
|
2017-03-31 12:12:46 +02:00 |
Juan Ferrer Toribio
|
1eb0fb9c8d
|
Merge
|
2017-03-14 13:11:34 +01:00 |
Juan Ferrer Toribio
|
f1c5a45657
|
ACLs habilitadas
|
2017-03-14 13:08:55 +01:00 |
Vicente Falco
|
4bc1cf455b
|
notes: Crear
|
2017-03-10 11:18:16 +01:00 |
Juan Ferrer Toribio
|
7059eadfc7
|
Correciones varias
|
2017-03-07 17:11:56 +01:00 |
Vicente Falco
|
2cb110feee
|
consignatario sin bind
|
2017-03-06 11:44:02 +01:00 |
Juan Ferrer Toribio
|
2cc7d96dce
|
Eslint
|
2017-03-01 09:55:17 +01:00 |
Juan Ferrer Toribio
|
0ef8995724
|
PersistedModel extendido
|
2017-02-28 18:10:11 +01:00 |
Juan Ferrer Toribio
|
ded4e07ab7
|
Errores solucionados
|
2017-02-28 11:46:18 +01:00 |