Commit Graph

1747 Commits

Author SHA1 Message Date
Vicente Falco 366a8e2f4d Jenkinsfile 2017-11-28 09:19:23 +01:00
Joan Sanchez ffde93614a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-28 08:45:16 +01:00
Joan Sanchez f5e3801c35 Error al incluir datasource.json 2017-11-28 08:44:44 +01:00
Vicente Falco 687439b00b Merge branch 'dev' into test 2017-11-28 08:32:43 +01:00
Vicente Falco c4c35a2ea3 Docker 2017-11-28 08:18:00 +01:00
Vicente Falco 8b79ec5cc8 Docker service print 2017-11-28 08:12:39 +01:00
Vicente Falco e90fe28578 Merge branch 'dev' into test 2017-11-28 07:24:28 +01:00
Joan Sanchez 09d788faaa Escritos, servicio print 2017-11-27 15:08:18 +01:00
Javi Gallego a16f8b29c2 vnCard con nuevo formato 2017-11-24 07:39:05 +01:00
Daniel Herrero c386b6aaea actualizacion de la material design cuando un elemento está bloquedo por ACL 2017-11-23 14:53:37 +01:00
Daniel Herrero 7cb64edf04 ajustes de etiquetas html y css 2017-11-23 14:09:38 +01:00
Daniel Herrero 00bd4a7696 nuevo comportamiento para dropDown, abrir arriba 2017-11-23 14:07:55 +01:00
Daniel Herrero 5ad2c70400 bug fixed in production and production filters 2017-11-23 08:35:17 +01:00
Joan Sanchez 02fb54efa9 merge 2017-11-22 20:55:44 +01:00
Joan Sanchez 774f577edd Ruta de validación de token en servicio Auth 2017-11-22 20:54:20 +01:00
Daniel Herrero aae137d35e changed datasource in employeeList service 2017-11-22 13:35:05 +01:00
Daniel Herrero ba73869fd3 changes in getRoleCustomer service 2017-11-22 13:24:36 +01:00
Daniel Herrero 3bd913cbd9 changed datasource in salesperson service 2017-11-22 13:19:51 +01:00
Daniel Herrero bd5e2a5d91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-22 13:10:40 +01:00
Daniel Herrero 27c2444fa4 bugs fixed in autoComplete 2017-11-22 13:10:33 +01:00
Javi Gallego bfd584487f limpieza de models auth obsoleto, ahora vn 2017-11-22 12:43:12 +01:00
Javi Gallego b3e8b4542a model client con la nueva nomenclatura 2017-11-22 08:59:21 +01:00
Javi Gallego 583e7c34bc Añadir activo a datos fiscal-data 2017-11-22 08:35:09 +01:00
Javi Gallego af5a4d65a9 cambio de fuente de raleway a roboto 2017-11-22 07:56:31 +01:00
Daniel Herrero c11b32a091 Merge branch 'dev' into test 2017-11-21 14:54:08 +01:00
Daniel Herrero e7d19da8f5 added sales person property into create new client 2017-11-21 14:53:09 +01:00
Daniel Herrero cf4c208eea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-21 14:52:13 +01:00
Daniel Herrero 8af0959d08 error corregido con tag acl repetido 2017-11-21 14:52:06 +01:00
Javi Gallego 26920bb124 adaptacion de border radius y notes con nuevo diseño 2017-11-21 14:22:59 +01:00
Javi Gallego a71d0ed8bc border radius en scss 2017-11-21 14:22:30 +01:00
Javi Gallego 52cbd1a870 eliminacion del style vn-empty, ahora se llama vn-auto 2017-11-21 12:44:28 +01:00
Javi Gallego 78eda1c70e errores de traduccion 2017-11-21 12:07:37 +01:00
Daniel Herrero 28c4cdfa5f removed eslint problems 2017-11-21 11:59:43 +01:00
Daniel Herrero 730d52169e bug fixed in salesperson query 2017-11-21 11:50:37 +01:00
Daniel Herrero 13c15bb5b3 production with searchbar 2017-11-21 11:12:52 +01:00
Daniel Herrero c615df2c1e test comentados pendientes revision con Carlos 2017-11-21 07:52:29 +01:00
Joan Sanchez a138554301 Cambiada ruta de petición al desactivar cliente. 2017-11-20 18:56:53 +01:00
Daniel Herrero 5cb54eb8e1 Merge branch 'dev' into test 2017-11-16 15:09:57 +01:00
Daniel Herrero 96f1db5cb7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-16 15:06:04 +01:00
Daniel Herrero ea35c1feda new searchBar 2017-11-16 15:05:45 +01:00
Juan Ferrer Toribio 719168565c Errores en el login no se mostraban 2017-11-16 14:30:17 +01:00
Juan Ferrer Toribio e03d257930 Errores en spinner 2017-11-16 13:47:18 +01:00
Juan Ferrer Toribio 519a55fac7 Merge, errores en spinner solucionados 2017-11-16 13:46:56 +01:00
Juan Ferrer Toribio 67829f5694 Correcciones varias 2017-11-16 12:35:07 +01:00
Vicente Falco 79e09e32e3 client: dni validation 2017-11-16 12:02:45 +01:00
Daniel Herrero 71efa734dc Merge branch 'test' 2017-11-16 09:06:41 +01:00
Daniel Herrero 7ba6b34d64 Merge branch 'dev' into test 2017-11-16 09:06:18 +01:00
Daniel Herrero 5874c80e85 removed uglify 2017-11-16 09:05:53 +01:00
Daniel Herrero a5d54ff470 Merge branch 'test' 2017-11-16 08:21:25 +01:00
Daniel Herrero e9bb56a045 Merge branch 'dev' into test 2017-11-16 07:52:21 +01:00