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 |
|
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 |