Dani Herrero
|
283d2ab440
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-07-06 12:58:54 +02:00 |
|
Dani Herrero
|
25ac346b2b
|
filtro principal y ajustes css
|
2017-07-06 12:58:50 +02:00 |
Juan Ferrer Toribio
|
6f581e033a
|
Merge
|
2017-07-06 12:43:37 +02:00 |
Vicente Falco
|
d8727b380c
|
change-worker
|
2017-07-06 12:21:19 +02:00 |
|
Vicente Falco
|
a7af81383b
|
merge
|
2017-07-06 11:31:26 +02:00 |
|
Vicente Falco
|
607c781f15
|
merge
|
2017-07-06 11:28:06 +02:00 |
|
Dani Herrero
|
0339fdaef1
|
cambio de hora funcionando
|
2017-07-06 11:05:26 +02:00 |
|
Vicente Falco
|
525c8bbcf8
|
merge
|
2017-07-06 10:39:52 +02:00 |
|
Vicente Falco
|
15fee03060
|
Endpoint change-time
|
2017-07-06 09:55:28 +02:00 |
|
Dani Herrero
|
4b767aa61f
|
tooltip template
|
2017-07-06 09:26:26 +02:00 |
|
Dani Herrero
|
3c1847134b
|
Front acoplado al endpoint RouteFk
|
2017-07-06 09:02:27 +02:00 |
|
Vicente Falco
|
d2e0051b38
|
Endpoint RouteFk
|
2017-07-06 08:45:33 +02:00 |
|
Dani Herrero
|
51ac5f5262
|
correccion ortográfica
|
2017-07-05 14:59:40 +02:00 |
|
Dani Herrero
|
81749e906d
|
refactorizacion popover
|
2017-07-05 14:41:10 +02:00 |
|
Dani Herrero
|
53af148def
|
corregido error popover
|
2017-07-05 14:01:03 +02:00 |
|
Dani Herrero
|
e4e01c4970
|
añadida id ruta en tabla, internacionalizacion y mejora de popover
|
2017-07-05 13:02:49 +02:00 |
|
Dani Herrero
|
ffe21e6947
|
corrección para popover anidados
|
2017-07-05 09:47:24 +02:00 |
|
Vicente Falco
|
c47c88dd10
|
model Routes
|
2017-07-04 10:13:17 +02:00 |
|
Dani Herrero
|
76d9546355
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-07-03 14:50:52 +02:00 |
|
Dani Herrero
|
f670c0f4fd
|
Localizador: restablecer filtros, datePicker con formato 'es'
|
2017-07-03 14:50:48 +02:00 |
nelo
|
e26838063b
|
rutas
|
2017-07-03 14:29:44 +02:00 |
|
nelo
|
f993504157
|
rutas
|
2017-07-03 14:29:09 +02:00 |
|
nelo
|
d5d5c3079a
|
corrección errores brocal
|
2017-07-03 14:23:53 +02:00 |
|
Vicente Falco
|
ba2d803f28
|
merge
|
2017-07-03 14:20:06 +02:00 |
|
Vicente Falco
|
9e6bd8522e
|
vies
|
2017-07-03 14:19:47 +02:00 |
|
nelo
|
ffe85cca17
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-07-03 09:42:55 +02:00 |
|
nelo
|
9b68abef9d
|
allowBlank client
|
2017-07-03 09:42:51 +02:00 |
|
Dani Herrero
|
06537bcf8d
|
filtro de trabajadores y llamada a validaciones opcional
|
2017-07-03 08:38:45 +02:00 |
|
Vicente Falco
|
18ae915452
|
Jenkins
|
2017-06-30 12:40:03 +02:00 |
|
Vicente Falco
|
e04c750bfd
|
Jenkins production
|
2017-06-30 11:38:55 +02:00 |
|
Vicente Falco
|
5b8488ce1d
|
merge
|
2017-06-30 09:27:28 +02:00 |
|
Vicente Falco
|
e3e7c9f863
|
endpoint ListadoTrabajadores
|
2017-06-30 09:26:55 +02:00 |
|
Dani Herrero
|
461fc3c9a6
|
internacionalización por subir
|
2017-06-30 09:09:48 +02:00 |
|
Dani Herrero
|
f4a4b7b45f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-29 14:28:26 +02:00 |
|
Dani Herrero
|
3bb1eef43d
|
bug fixed in dropDown
|
2017-06-29 14:28:22 +02:00 |
|
nelo
|
37c1c654b7
|
get correct user sender
|
2017-06-29 14:15:23 +02:00 |
|
Dani Herrero
|
6365a06cbb
|
Servicio mensaje de alerta modificado
|
2017-06-29 14:13:01 +02:00 |
|
nelo
|
8e177fcb2d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-29 14:09:11 +02:00 |
|
Dani Herrero
|
372cfe718b
|
Localizador: warehouseFk por defecto
|
2017-06-29 14:09:04 +02:00 |
|
nelo
|
c5363155c4
|
send message
|
2017-06-29 14:08:57 +02:00 |
|
Dani Herrero
|
d8f4e0489e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-29 13:56:56 +02:00 |
|
Dani Herrero
|
491ea3b796
|
dropDown with search and columHeader preview icon
|
2017-06-29 13:56:52 +02:00 |
|
nelo
|
2e7a225249
|
rawsql with promises
|
2017-06-29 11:48:57 +02:00 |
|
nelo
|
e9c0fa5cc9
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
# Conflicts:
# client/production/src/index/index.js
|
2017-06-29 09:52:45 +02:00 |
|
nelo
|
ddcec00c4f
|
change time
|
2017-06-29 09:48:00 +02:00 |
|
Dani Herrero
|
df614b4943
|
bugs fixed
|
2017-06-29 08:13:30 +02:00 |
|
Dani Herrero
|
5e2be42247
|
bugs fixed
|
2017-06-28 14:59:54 +02:00 |
|
Dani Herrero
|
5b5523e6b6
|
refactorización vnProductionTable
|
2017-06-28 14:53:26 +02:00 |
|
Dani Herrero
|
bfdd8ecd8e
|
Localizador: acciones separadas a nuevo componente vnProductionActions
|
2017-06-28 14:48:07 +02:00 |
|
Dani Herrero
|
6815ab2b3c
|
Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran)
|
2017-06-28 13:12:01 +02:00 |