Commit Graph

4854 Commits

Author SHA1 Message Date
Gerard 5db2783385 Merge branch 'test' into dev 2019-01-29 14:44:25 +01:00
Gerard ef3930fdd7 Merge branch 'master' into test 2019-01-29 14:43:57 +01:00
Gerard 94f19c2cb5 #1073 item.tags no busca tags cuando se añade una linea nueva 2019-01-29 14:38:31 +01:00
Carlos Jimenez Ruiz 69a176a661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 13:24:30 +01:00
Gerard d4c6d28fec Merge branch 'test' into dev 2019-01-29 11:23:42 +01:00
Gerard 036a75617a Merge branch 'master' into test 2019-01-29 11:22:48 +01:00
Gerard f6f1dba1d9 #1071 modificar update.claim para que no utilice updateAll 2019-01-29 11:14:01 +01:00
Carlos Jimenez Ruiz 753e82b00d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 11:07:43 +01:00
Carlos Jimenez Ruiz 68ba460548 removed gulp docker from gulp backTest sequence 2019-01-29 11:07:37 +01:00
Javi Gallego bb88c9cfe4 gulpfile back Tasks fixed for windows 2019-01-29 09:45:02 +01:00
Carlos Jimenez Ruiz fc450168c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 08:53:56 +01:00
Carlos Jimenez Ruiz c04071366f #1063 client.summary añadir explicaciones 2019-01-29 08:53:29 +01:00
Juan Ferrer 9209424bca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 16:24:56 +01:00
Juan Ferrer 3e40c651af #998 worker.index 2019-01-28 16:24:45 +01:00
Carlos Jimenez Ruiz 9def2ed863 #1055 e2e user configuration 2019-01-28 13:44:03 +01:00
Carlos Jimenez Ruiz 0b173befe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 13:42:21 +01:00
Carlos Jimenez Ruiz cb8b33a476 #1055 e2e user configuration user company check 2019-01-28 13:42:11 +01:00
Carlos Jimenez Ruiz 01fd9fd5fe #1055 e2e user configuration 2019-01-28 13:41:57 +01:00
Joan Sanchez 0fcbc65ecc plantilla claim-pickup #1044 2019-01-28 12:28:22 +01:00
Juan Ferrer c02164d884 Fix 2019-01-28 12:16:22 +01:00
Juan Ferrer 3bb42b1d7b Project configuration fixed 2019-01-28 12:14:22 +01:00
Javi Gallego 99d0d73136 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 12:09:29 +01:00
Joan Sanchez 6495698308 treeview fixes #1015 2019-01-28 12:07:46 +01:00
Javi Gallego 5954cc7034 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 12:07:18 +01:00
Javi Gallego 086b773423 gulpfile para windows 2019-01-28 12:06:52 +01:00
Juan Ferrer cb85610c5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 10:04:20 +01:00
Juan Ferrer ce99ab64bd #1058 Fixed 2019-01-28 10:04:08 +01:00
Bernat 7a879f5431 #996, new model personDepartment 2019-01-28 09:52:53 +01:00
Juan Ferrer 9b1a52e47d Manifest color changed 2019-01-28 09:10:41 +01:00
Juan Ferrer fca1595f6f Login style fixes 2019-01-28 09:09:17 +01:00
Juan Ferrer e940853840 Watch enabled in print services, unused icons remove from topbar 2019-01-28 09:07:46 +01:00
Juan Ferrer d94090f2b0 Dockerfile fixes 2019-01-28 01:26:00 +01:00
Juan Ferrer 8898d394fa Dockerfile fixes 2019-01-28 01:25:03 +01:00
Juan Ferrer 6f558ecad4 Login 2019-01-28 01:05:18 +01:00
Juan Ferrer 41caf1a158 HTML manifest 2019-01-28 00:54:37 +01:00
Juan Ferrer 18c7851fb7 Merge 2019-01-28 00:32:28 +01:00
Juan Ferrer 317102b612 Section titile in topbar, responsive 2019-01-28 00:26:01 +01:00
Carlos Jimenez Ruiz cb99ac2811 #1052 e2e extension para refrescar formularios/vistas 2019-01-27 21:09:54 +01:00
Carlos Jimenez Ruiz 7333cb4114 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-27 20:49:21 +01:00
Carlos Jimenez Ruiz b144f24f24 #1052 e2e extension para refrescar formularios/vistas 2019-01-27 20:49:15 +01:00
Juan Ferrer 005193c23c Jenkins fixes 2019-01-27 11:15:20 +01:00
Juan Ferrer 87395d68cd Jenkins fixes 2019-01-26 20:51:37 +01:00
Juan Ferrer 262d03689f Merge branch 'test' into dev 2019-01-26 20:43:58 +01:00
Juan Ferrer bf818e5822 Gulpfile mysql wait time reduced to 5 min 2019-01-26 20:43:31 +01:00
Juan Ferrer 14d958a44a Jenkinsfile fixes 2019-01-26 20:42:48 +01:00
Juan Ferrer c956ef59d6 Gulpfile fixes for CI 2019-01-26 20:30:45 +01:00
Juan Ferrer 69bb8173c0 Jenkins fixes for CI 2019-01-26 20:26:14 +01:00
Juan Ferrer 009a11fefe Jenkins fixes 2019-01-26 19:38:53 +01:00
Juan Ferrer 773f24faee Jenkins test 2019-01-26 19:36:36 +01:00
Carlos Jimenez Ruiz 84c680d8ed e2e repairs 2019-01-26 15:53:06 +01:00