Commit Graph

14255 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 5cbeac7d6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 11:54:24 +01:00
Carlos Jimenez Ruiz e45b6886c0 selectors update 2019-01-22 11:54:17 +01:00
Joan Sanchez bdce8d9aa5 fixed prod config path volume 2019-01-22 11:48:00 +01:00
Joan Sanchez 166546564d updated payment-update path Method 2019-01-22 11:30:25 +01:00
Joan Sanchez 394f756f2b Merge branch 'dev' into test 2019-01-22 11:18:26 +01:00
Joan Sanchez 668da9ac12 added print folder to gulpfile install 2019-01-22 11:16:14 +01:00
Joan Sanchez de15600a1a Merge branch 'dev' into test 2019-01-22 10:58:30 +01:00
Joan Sanchez ec1d36f8b9 copy print folder on dockerfile build 2019-01-22 10:57:52 +01:00
Gerard 471374f32d excluded test due changes in mailer #79 2019-01-22 10:31:36 +01:00
Gerard b0a60fc94a #1023 claim.detail cantidad total parecer ser erronea 2019-01-22 10:31:12 +01:00
Joan Sanchez 55708c4d68 Merge branch 'dev' into test 2019-01-22 10:04:56 +01:00
Gerard 457e68cd3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 10:04:53 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Joan Sanchez db7f69fc41 removed link to mailer service on docker compose 2019-01-22 10:04:38 +01:00
Joan Sanchez 72791bd43e Merge branch 'dev' into test 2019-01-22 10:00:48 +01:00
Joan Sanchez 4e83172dae added print service part 1 #1001 2019-01-22 09:55:35 +01:00
Carlos Jimenez Ruiz 69666177b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 17:01:15 +01:00
Carlos Jimenez Ruiz 2011e56a6a #982 Preparar tests para que puedan ser lanzados desde el servidor 2019-01-21 17:01:01 +01:00
Juan Ferrer 0f55512918 Style fixes 2019-01-21 16:08:25 +01:00
Juan Ferrer d856a3ae97 Merge 2019-01-21 15:22:20 +01:00
Juan Ferrer 09811d322a Descriptor style fixes 2019-01-21 15:21:24 +01:00
Bernat 643dcc3856 update model sip 2019-01-21 14:53:23 +01:00
Bernat 4da9d7a9d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 14:52:41 +01:00
Joan Sanchez ae2c5089d4 removed print & mail services 2019-01-21 14:46:22 +01:00
Bernat 6f27a2e3fd update fixtures #9466 2019-01-21 13:48:32 +01:00
Bernat 79a7447030 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 13:47:21 +01:00
Joan Sanchez 1ed63de3b9 Merge branch 'dev' into test 2019-01-21 11:46:59 +01:00
Joan Sanchez 5a53195574 agency module 2019-01-21 11:45:53 +01:00
Bernat c87fd81a62 new model sip and fixtures #9474 2019-01-21 11:35:37 +01:00
Bernat 6e84a43e99 update structure db #9480 2019-01-21 09:25:02 +01:00
Joan Sanchez 1989232949 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 09:12:33 +01:00
Gerard 2a339185fc stowaway fixes 2019-01-21 08:45:02 +01:00
Gerard ea0504db21 stowaway fixes 2019-01-21 08:44:21 +01:00
Joan Sanchez b73c02c595 client summary red color on negative balance #1007 2019-01-21 08:16:43 +01:00
Juan Ferrer 6e43b11e16 Left menu fixed 2019-01-20 18:48:03 +01:00
Juan Ferrer 2df9579f2c Summary style fixes 2019-01-20 16:47:04 +01:00
Joan Sanchez 9cb298fb08 modules summary were not updating view data #978 2019-01-18 14:04:12 +01:00
Gerard cb650bbdbc added missing locale 2019-01-18 13:38:18 +01:00
Gerard 32743cb1d2 updated description 2019-01-18 13:37:48 +01:00
Gerard 97b2c23179 #952 Ticket.descriptor eliminar polizon 2019-01-18 13:37:26 +01:00
Gerard 345acc1353 #951 ticket.descriptor añadir polizon 2019-01-18 13:36:13 +01:00
Gerard e9bc3f00a1 #954 ticket.descriptor añadir link a polizon 2019-01-18 13:34:50 +01:00
Joan Sanchez fc7b4e4eda changed item diary colors #990 2019-01-18 10:59:33 +01:00
Bernat 9e3788b37b create new views #9440 2019-01-17 12:12:26 +01:00
Juan Ferrer f94b35176e Disable concurrent builds in Jenkinsfile 2019-01-17 12:06:40 +01:00
Bernat 5abe575fbe update fixture and export structure #9462 #9437 2019-01-17 11:15:23 +01:00
Gerard 0c0a465784 descriptor not showing correctly fixed 2019-01-17 11:11:45 +01:00
Gerard 2b2fe69d0d alert level not available fixed 2019-01-17 11:04:00 +01:00
Juan Ferrer 2c8e52d04d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-17 10:44:18 +01:00
Juan Ferrer 06216201e2 Jenkinsfile modified 2019-01-17 10:44:07 +01:00