Commit Graph

7556 Commits

Author SHA1 Message Date
Dani Herrero b93c3f50e3 cambiando searchBar 2017-07-11 10:35:23 +02:00
Dani Herrero c788ea5e29 config en minusculas 2017-07-11 10:34:25 +02:00
Dani Herrero 35d213874e merge 2017-07-11 10:32:54 +02:00
Dani Herrero 71ed56ac6a merge 2017-07-11 10:28:03 +02:00
Dani Herrero 2f6047d241 merge 2017-07-11 10:00:29 +02:00
Vicente Falco 0d49f5e8fe merge 2017-07-11 09:36:28 +02:00
Vicente Falco f1fda284cb varios cambios 2017-07-11 09:36:11 +02:00
Dani Herrero 81726e0a09 columnHeader change icon, style 2017-07-11 08:59:12 +02:00
Dani Herrero bbd09b3d36 eliminado console.log 2017-07-06 14:48:05 +02:00
Dani Herrero 2b7abef98f corregido filtro principal 2017-07-06 14:46:22 +02:00
Dani Herrero 142cc920de bug de multi seleccion corregido, cambio estilos 2017-07-06 14:21:55 +02:00
Juan Ferrer Toribio 5929b8be32 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-06 13:04:51 +02:00
Juan Ferrer Toribio 46e9029be3 Directorio obsoleto borrado 2017-07-06 13:04:43 +02:00
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