Commit Graph

687 Commits

Author SHA1 Message Date
Javi Gallego 51f8d01d24 Error de roles solucionado a falta de dump 2018-02-22 16:17:30 +01:00
Daniel Herrero 10e47acd6b item clonation finish 2018-02-22 13:40:23 +01:00
Daniel Herrero b999254433 ItemSummary into dialog 2018-02-22 08:18:57 +01:00
Daniel Herrero b5611d0cc5 refactor vnTooltip 2018-02-21 13:42:47 +01:00
Daniel Herrero 027c19f5c5 bug fixed itemData 2018-02-21 13:15:50 +01:00
Daniel Herrero d69954bb36 itemBotanical fixed with test 2018-02-21 13:10:23 +01:00
Daniel Herrero 8d5b329839 bug fixed in getModifiedData 2018-02-21 12:36:37 +01:00
Daniel Herrero 626a0ec7ca custom icons v1 2018-02-21 11:41:22 +01:00
Daniel Herrero ade0e3beb0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-21 11:11:18 +01:00
Daniel Herrero a153005a79 bugs fixed with itemBotanical model 2018-02-21 11:10:00 +01:00
Daniel Herrero f1f8c74175 refactor watcher added requiredField 2018-02-21 11:09:27 +01:00
Javi Gallego 26b8bcfe94 cambio de los permisos del menu 2018-02-21 09:43:13 +01:00
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
Daniel Herrero 7ab1a8852b itemSummary 2018-02-20 14:51:46 +01:00
Daniel Herrero 60e2d8132b itemBotanical 2018-02-20 14:30:02 +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
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 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
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 dcf5bf61da backend unit test for barcode duplicity plus e2e path completed 2018-02-19 11:55:45 +01:00
Daniel Herrero 6fe1f96ef3 Bug fixeds and merge with test 2018-02-15 14:37:54 +01:00
Daniel Herrero 1b4fd50929 Bugs fixed: postalCode, credit list and validate DNI 2018-02-15 13:04:48 +01:00
Daniel Herrero a1dd3e1a77 Bug fixed postalCode in Adresses 2018-02-15 11:44:03 +01:00
Daniel Herrero 81b374d744 Merge conflicts 2018-02-15 10:51:31 +01:00
Carlos Jimenez 0354628324 acl for item barcode 2018-02-15 08:49:58 +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 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 ca03005e10 test fixed 2018-02-14 14:05:02 +01:00
Daniel Herrero 21cc4e3320 semantic refactor 2018-02-14 14:04:47 +01:00
Javi Gallego 225508dd07 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:34:47 +01:00
Javi Gallego aadf763e76 refactor html 2018-02-14 11:33:21 +01:00
Daniel Herrero a4341b3682 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:21:23 +01:00
Daniel Herrero 9c9015a197 zoomImage test fixed 2018-02-14 11:21:14 +01:00
Javi Gallego 8130b35434 Tarea #62 abre foto en otra pestaña 2018-02-14 10:56:41 +01:00
Javi Gallego 48f0554a6a Tarea #62 link a la foto 2018-02-14 10:06:51 +01:00
Juan Ferrer Toribio e4595da2a7 E2E test partially fixed 2018-02-14 10:03:00 +01:00
Daniel Herrero 20506bdc59 re-refactor zoomImage 2018-02-14 09:25:41 +01:00