Dani Herrero
|
408b511e6d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-15 12:00:57 +02:00 |
|
Dani Herrero
|
1ca5e20494
|
añadido callBack cambio estados
|
2017-06-15 12:00:51 +02:00 |
nelo
|
80b9815a57
|
callback error list warehouses, change-state
|
2017-06-15 11:59:15 +02:00 |
|
Dani Herrero
|
bc4402ce22
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-15 11:22:53 +02:00 |
|
Dani Herrero
|
5f2aa345ba
|
iconMenu arreglo de posicion del DropDown interno
|
2017-06-15 11:22:47 +02:00 |
|
nelo
|
b86f71bb25
|
llamamos al servicio client para obtener el empleado
cambiamos el estado
|
2017-06-15 11:02:50 +02:00 |
|
Dani Herrero
|
f346e5e83c
|
arreglos en drop-down
|
2017-06-15 08:26:03 +02:00 |
|
Dani Herrero
|
17c38c9b4b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-15 07:45:09 +02:00 |
|
Dani Herrero
|
9072b100f9
|
tooltip admite plantilla html, icon-menu forzado de posicion en dropDown
|
2017-06-15 07:45:01 +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 |
|
Dani Herrero
|
7713d0bd6f
|
cambio estilos dropdown
|
2017-06-13 14:57:09 +02:00 |
|
nelo
|
6adc734f69
|
change state ticket
|
2017-06-13 13:57:40 +02:00 |
|
Dani Herrero
|
e09f60a53a
|
Nuevos componentes: drop-down, icon-menu. Refactorización de icon e icon-button (pasados a componentes sin template manager)
|
2017-06-13 13:08:06 +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 |
|
Dani Herrero
|
8a31a3608b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-08 14:57:28 +02:00 |
|
Dani Herrero
|
f274335997
|
interfaz gráfica y correcciones varias
|
2017-06-08 14:57:23 +02:00 |
Vicente Falco
|
ee2abe79de
|
merge
|
2017-06-08 11:09:11 +02:00 |
|
Vicente Falco
|
dbb1632632
|
nginx docker
|
2017-06-08 11:08:45 +02:00 |
|
Dani Herrero
|
491241398a
|
localizador y tooltip arreglo estilos
|
2017-06-08 10:05:11 +02:00 |
|
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 |
Juan Ferrer Toribio
|
0fd9db06f6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-07 08:39:43 +02:00 |
|
Juan Ferrer Toribio
|
5d789b0e71
|
Locales
|
2017-06-07 08:39:40 +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 |