Commit Graph

1695 Commits

Author SHA1 Message Date
Javi Gallego 41dfa9f9a1 creacion de ACL en diferentes modelos 2018-02-21 09:28:17 +01:00
Daniel Herrero c983859cde bug fixed ItemBotanical 2018-02-21 08:44:00 +01:00
Carlos Jimenez 22d32aa031 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-20 22:36:03 +01:00
Carlos Jimenez 1e601ab6b6 e2e path for niches completed plus extension name corrected 2018-02-20 22:35:54 +01:00
Carlos Jimenez da8610d814 fixed e2e 2018-02-20 15:22:24 +01:00
Bernat Exposito 2daed2bda9 import fixtures from DB produccion and create unique index for vn2008.Articles_nicho 2018-02-20 15:01:59 +01:00
Daniel Herrero 7ab1a8852b itemSummary 2018-02-20 14:51:46 +01:00
Daniel Herrero 60e2d8132b itemBotanical 2018-02-20 14:30:02 +01:00
Daniel Herrero ada3d9480b bug fixed acl obervationType 2018-02-20 14:05:05 +01:00
Juan Ferrer Toribio 7c3efd40d5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 13:48:37 +01:00
Juan Ferrer Toribio e491b2a7b3 E2E merge 2018-02-20 13:48:25 +01:00
Carlos Jimenez 6b70556320 acls are back to obersvation-type.json properties 2018-02-20 13:38:04 +01:00
Daniel Herrero 93134cb39f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 12:58:10 +01:00
Daniel Herrero 099d7ff7fe fixed unit test in ItemCard 2018-02-20 12:58:00 +01:00
Carlos Jimenez a70f65f0b9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-20 12:33:44 +01:00
Daniel Herrero 1de608b9a9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 12:33:26 +01:00
Daniel Herrero 5f07fab6cf item-summary 2018-02-20 12:33:17 +01:00
Carlos Jimenez 4251ee20e4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-20 12:26:29 +01:00
Carlos Jimenez 09508aaef1 acls for niches 2018-02-20 12:26:09 +01:00
Carlos Jimenez 144d5a2bf0 issue 40 completed: niches 2018-02-20 12:25:51 +01:00
Bernat Exposito 4c26879fdb update fixtures edi.genus/specie 2018-02-20 11:16:02 +01:00
Daniel Herrero ecc513272f refactor itemBotanical and item 2018-02-20 11:10:54 +01:00
Juan Ferrer Toribio 1dfafe0d44 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 10:00:26 +01:00
Juan Ferrer Toribio eb0276183f E2E refactor, Snackbar with hide button, Dialog, bugs solved 2018-02-20 10:00:19 +01:00
Daniel Herrero a3985e70ed Tarea #37 ItemBotanical 2018-02-20 08:53:06 +01:00
Carlos Jimenez feabfc05d6 html indent refactors 2018-02-19 20:52:07 +01:00
Carlos Jimenez 9e4d03ecf3 electron now closes after each e2e path completed. 2018-02-19 20:50:01 +01:00
SAMBA\bernat 20229cf3e1 update fixtures 2018-02-19 13:39:31 +01:00
SAMBA\bernat 171d0f5867 update changes05-articles_nicho 2018-02-19 13:21:15 +01:00
SAMBA\bernat 0f1004f5de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-19 12:52:33 +01:00
SAMBA\bernat 3018898cad update fixtures / alter table vn2008.articles_nicho 2018-02-19 12:50:14 +01:00
Carlos Jimenez 84bc505937 adapted test to show now 6 sales person 2018-02-19 11:58:02 +01:00
Carlos Jimenez b8e6a8d0b3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-19 11:56:05 +01:00
Carlos Jimenez dcf5bf61da backend unit test for barcode duplicity plus e2e path completed 2018-02-19 11:55:45 +01:00
SAMBA\bernat f4735b4666 update fixtures Botanical 2018-02-19 09:42:40 +01:00
SAMBA\bernat f2d5d58513 fixtures for Barcode and itemPlacement 2018-02-16 14:58:51 +01:00
SAMBA\bernat 2390ee3b01 update fixtures / script for automatic change update in the BD 2018-02-16 13:01:04 +01:00
SAMBA\bernat 63718d4d86 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-16 07:45:29 +01:00
Juan Ferrer Toribio 2240b4f6d8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 16:11:54 +01:00
Juan Ferrer Toribio e6a753d1cf Addresses ordered by nickname 2018-02-15 16:11:44 +01:00
Daniel Herrero 554ec56762 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 14:38:05 +01:00
Daniel Herrero 6fe1f96ef3 Bug fixeds and merge with test 2018-02-15 14:37:54 +01:00
Daniel Herrero 754cfbc7b0 MD5 in password web access 2018-02-15 14:35:04 +01:00
Carlos Jimenez 261e05a752 fixed e2e for the postalCode change in address-edit/create htmls 2018-02-15 13:20:01 +01:00
Daniel Herrero 505ff1dcfe removed role from activeSalesPerson 2018-02-15 13:11:23 +01:00
Daniel Herrero 1b4fd50929 Bugs fixed: postalCode, credit list and validate DNI 2018-02-15 13:04:48 +01:00
Carlos Jimenez d2a2aa08d7 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-15 12:28:16 +01:00
Carlos Jimenez 5d894f868c e2e path files preparation for ITEMs module plus the refactor required 2018-02-15 12:28:05 +01:00
Daniel Herrero a1dd3e1a77 Bug fixed postalCode in Adresses 2018-02-15 11:44:03 +01:00
Daniel Herrero a3cfb155e0 new models: genus, item-botanical, specie 2018-02-15 10:58:02 +01:00