Commit Graph

3225 Commits

Author SHA1 Message Date
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
Daniel Herrero 81b374d744 Merge conflicts 2018-02-15 10:51:31 +01:00
SAMBA\bernat 2b04e993d1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 10:45:56 +01:00
Carlos Jimenez 580efa1b84 fixed all e2e and selectors 2018-02-15 10:03:49 +01:00
SAMBA\bernat 684b64471e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 09:58:13 +01:00
Carlos Jimenez 0354628324 acl for item barcode 2018-02-15 08:49:58 +01:00
SAMBA\bernat dfd4c61015 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 07:17:03 +01:00
Carlos Jimenez 3abc4c7a68 backend unit test for crudItemBarcodes 2018-02-14 16:49:19 +01:00
Carlos Jimenez 79c4aac3f5 corrected indentation on routes.json and added one path to services tests js 2018-02-14 15:56:22 +01:00
Carlos Jimenez f0c8445149 refactor on back end tests gulp task plus file to use pending to be finished 2018-02-14 14:52:35 +01:00
Carlos Jimenez bde655bd1e merge 2018-02-14 14:32:26 +01:00
Carlos Jimenez 6e1d3135d5 mini refactor on routes.json and crudAddressObervations 2018-02-14 14:24:14 +01:00
Carlos Jimenez 61cd4acca5 item-barcode functionality plus front end tests 2018-02-14 14:22:35 +01:00
Daniel Herrero fea4b379c7 Bug #78 Fixed 2018-02-14 14:06:01 +01:00
Daniel Herrero ca03005e10 test fixed 2018-02-14 14:05:02 +01:00
Daniel Herrero 21cc4e3320 semantic refactor 2018-02-14 14:04:47 +01:00
Daniel Herrero 4aa2d2a255 remove obsolete package 2018-02-14 14:03:46 +01:00
SAMBA\bernat 3cb13d3ed7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 12:57:56 +01:00
Juan Ferrer Toribio 87dfa49692 Bugs with webpack assets solved 2018-02-14 12:52:24 +01:00
SAMBA\bernat e79beaa13f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 12:09:50 +01:00
Juan Ferrer Toribio cb92e48eef Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:46:20 +01:00