Commit Graph

4468 Commits

Author SHA1 Message Date
Gerard f83c721c95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 16:05:41 +01:00
Carlos Jimenez Ruiz d6255bc997 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 16:05:37 +01:00
Carlos Jimenez Ruiz b111480023 removed bcrypt due to backend error upon login 2019-01-24 16:05:07 +01:00
Juan Ferrer e600a4b5b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 16:04:51 +01:00
Juan Ferrer bfb2f7f533 #981 vnLeftMenu fixes 2019-01-24 16:04:38 +01:00
Gerard 5fce69cd5c #1022 ticket.create 2019-01-24 15:50:21 +01:00
Carlos Jimenez Ruiz 18d7d07f56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 15:41:56 +01:00
Carlos Jimenez Ruiz 7096273800 #1045 ticket.datos basicos 2019-01-24 15:41:48 +01:00
Carlos Jimenez Ruiz 1337e0e92f #1051 Traducciones que fallan 2019-01-24 15:35:45 +01:00
Joan Sanchez 74421790db print reportEngine fixes & claim report #1044 2019-01-24 15:03:01 +01:00
Bernat 31dc2bd5e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 14:15:16 +01:00
Bernat 6f316d54b4 #9477 update fixtures and structure 2019-01-24 14:15:08 +01:00
Carlos Jimenez Ruiz f33587a0b7 #1051 Traducciones que fallan 2019-01-24 14:03:01 +01:00
Carlos Jimenez Ruiz 6bfa39e0eb #1030 ticket.index orden siempre por fecha ascencente 2019-01-24 13:50:57 +01:00
Bernat b7aa8e97a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 12:37:43 +01:00
Juan Ferrer 6a1e1439e0 JUnit reporter not loaded when not used 2019-01-24 12:29:10 +01:00
Carlos Jimenez Ruiz f9c79241ae #1042 gulp backTest fixed 2019-01-24 12:01:35 +01:00
Carlos Jimenez Ruiz 366527d87e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 11:07:23 +01:00
Carlos Jimenez Ruiz 45caad4c0f gulp-nodemon dev dependency added 2019-01-24 11:07:15 +01:00
Juan Ferrer 637c61063b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 10:57:45 +01:00
Juan Ferrer adfd69b393 #981 e2e passed 2019-01-24 10:57:43 +01:00
Gerard 91b0484c74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 10:04:20 +01:00
Gerard 8b17524432 changed salesperson definition 2019-01-24 10:04:18 +01:00
Juan Ferrer 1ccffd63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:25:57 +01:00
Juan Ferrer 498ae5d4fe Keybindings bugs fixed 2019-01-24 09:25:51 +01:00
Carlos Jimenez Ruiz 79ee9bb0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:08:38 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Gerard e6ee15fc8d console log removed 2019-01-24 08:25:48 +01:00
Gerard bbb7fafed1 fixed default search on ticket index 2019-01-24 08:21:00 +01:00
Bernat 9ad703f625 update structure cau 9511 and fix test 2019-01-24 07:39:23 +01:00
Bernat e6f0d0908d update structure cau 9565 2019-01-24 07:36:57 +01:00
Bernat fa9918d22c new model and fixtures for PersonMedia #996 cau 9477 2019-01-24 07:36:26 +01:00
Juan Ferrer 30749f0f4d #981 Back & front tests passed, keybinds on it's own module routes.json 2019-01-23 17:49:28 +01:00
Gerard 288300db41 #1048 ticket.index quitar columnas 2019-01-23 16:51:39 +01:00
Gerard 23d26dec07 updated issue number 2019-01-23 16:32:17 +01:00
Carlos Jimenez Ruiz 2673a36578 small e2e refactors 2019-01-23 16:00:56 +01:00
Carlos Jimenez Ruiz 42dc6ec150 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-23 15:34:24 +01:00
Carlos Jimenez Ruiz 5240a5ada6 #1021 e2e login extension v3 2019-01-23 15:34:16 +01:00
Carlos Jimenez Ruiz 648bd46862 small e2e refactors 2019-01-23 15:33:25 +01:00
Gerard 94ba5d48c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-23 15:06:26 +01:00
Gerard 649c09c551 #1025 item.create al crear articulo nuevo no busca tipo ni color 2019-01-23 15:06:11 +01:00
Joan Sanchez 747b593c90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-23 14:53:16 +01:00
Joan Sanchez b466886adc fixed dialog was aplying text-transform to all buttons 2019-01-23 14:53:13 +01:00
Gerard cd28d559c4 #1026 ticket.line 2019-01-23 14:12:05 +01:00
Juan Ferrer e080802445 #981 Login unified without passing tests 2019-01-23 13:11:44 +01:00
Gerard 61bd8740ce modal-form class renamed 2019-01-23 12:46:45 +01:00
Gerard 05933781dc #1031 order.create que se puedan crear tickets para clientes con riesgo 2019-01-23 12:34:42 +01:00
Gerard aeb0f65fec #1037 order.descriptor 2019-01-23 12:30:32 +01:00
Gerard e6213fb83f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-23 11:17:35 +01:00
Gerard 05ed72661e test fixed 2019-01-23 11:17:18 +01:00