Commit Graph

2196 Commits

Author SHA1 Message Date
Bernat Exposito d7192ebb3c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 14:35:46 +01:00
Daniel Herrero 2877ec05cc mock ticketItem 2018-03-14 14:26:25 +01:00
Bernat Exposito b8979e76f5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 14:20:17 +01:00
Bernat Exposito 0e04d97dc0 update model packaging.sql 2018-03-14 14:20:01 +01:00
Daniel Herrero 8f0f71a3ca Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 13:59:04 +01:00
Daniel Herrero e6a8b34fe4 filter tickets 2018-03-14 13:59:01 +01:00
Bernat Exposito a4166cc14d update model packaging.json 2018-03-14 13:51:07 +01:00
Bernat Exposito ab3ead6a28 added modelconfig.json for models in the commit 60f3bfc and new procedure 04.ticketVolume 2018-03-14 13:00:17 +01:00
Bernat Exposito 5e01ab1a9f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 12:58:30 +01:00
Daniel Herrero 82949b42b5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 12:12:12 +01:00
Daniel Herrero c21efeeb63 ticket summary structure 2018-03-14 12:12:06 +01:00
Bernat Exposito 60f3bfc7b8 create models saleChecked saleComponent, added fixtures and ACL 2018-03-14 12:06:21 +01:00
Javi Gallego 19870a7732 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 12:04:09 +01:00
Daniel Herrero 6df5f1c3fa Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 11:41:22 +01:00
Daniel Herrero 856fc64742 frontEnd ticket module file system 2018-03-14 11:41:19 +01:00
Joan Sanchez 708c822ab0 Credit classification & credit insurance task #150, #151, #152 2018-03-14 11:36:57 +01:00
Javi Gallego 6879435011 fuentes client descriptor 2018-03-14 11:15:14 +01:00
Javi Gallego 93baddbfc2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 17:39:16 +01:00
Javi Gallego 54cbf97183 mas iconos 2018-03-13 17:29:54 +01:00
Javi Gallego 2ef22e7e83 indice con mas tamaño 2018-03-13 16:25:24 +01:00
Daniel Herrero 791c0e2d41 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 14:53:55 +01:00
Daniel Herrero 9d46009e2b remove old template in autocomplete 2018-03-13 14:53:52 +01:00
Carlos Jimenez 0e8fe7fead merge plus #167 error en el id al crear item task 2018-03-13 14:46:39 +01:00
Juan abb874530c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 14:37:56 +01:00
Juan 9b40c10609 Eslint fix in gulp 2018-03-13 14:37:52 +01:00
Vicente Falco 6dd3de1330 Jenkins 2018-03-13 14:36:00 +01:00
Daniel Herrero 5530828d62 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 14:30:51 +01:00
Daniel Herrero 176ce860ca Tarea #164 Filtros con superpoderes 2018-03-13 14:30:25 +01:00
Javi Gallego a6994b0179 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 14:07:47 +01:00
Javi Gallego d9f932b2c1 añadir fuentes 2018-03-13 14:07:42 +01:00
Juan fa9f8a79a8 vnAutocomplete filter fixes 2018-03-13 13:55:21 +01:00
Juan 75c1dd886d vnAutocomplete fixes 2018-03-13 13:41:54 +01:00
Juan 06e9c97b3e vnDropDown positioning bug fixed 2018-03-13 13:21:53 +01:00
Juan d8b39ea5ac Missing $inject fixed 2018-03-13 13:15:06 +01:00
Juan 9b153aec5a DNI validation fixes 2018-03-13 12:14:06 +01:00
Juan f3044644b0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 12:07:35 +01:00
Juan 3fd4e29429 vnTextarea style fix, new component vnMenu wich extends vnPopover 2018-03-13 12:07:28 +01:00
Carlos Jimenez 757e67312e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-13 11:44:39 +01:00
Vicente Falco 95e96a91a7 datasource loopback unique 2018-03-13 11:15:39 +01:00
Vicente Falco aad1d5d0f3 merge 2018-03-13 10:48:29 +01:00
Vicente Falco af789caff3 merge 2018-03-13 10:48:04 +01:00
Carlos Jimenez 2b9d89ab20 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-12 19:38:12 +01:00
Juan 6b1ad875cb DNI validation fix 2018-03-12 17:18:18 +01:00
Juan ada0f40ece DNI validation fixed 2018-03-12 14:13:36 +01:00
Juan 7825350884 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-12 14:02:36 +01:00
Juan 5c9dab163d Added client ticket module 2018-03-12 14:02:29 +01:00
Bernat Exposito a813fe805e create services ticket, fixtures and models for salix 1.7.0 2018-03-12 13:55:18 +01:00
Carlos Jimenez 23e3e4bf36 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-12 13:31:05 +01:00
Juan 3dbd7e6bc0 Client.createWithUser refactored to async/await 2018-03-12 13:09:52 +01:00
Javi Gallego 3dac1be401 Modificacion de traduccion mas apropiada 2018-03-12 12:58:29 +01:00