Daniel Herrero
|
027c19f5c5
|
bug fixed itemData
|
2018-02-21 13:15:50 +01:00 |
|
Daniel Herrero
|
31e2000c32
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-21 13:10:34 +01:00 |
|
Daniel Herrero
|
d69954bb36
|
itemBotanical fixed with test
|
2018-02-21 13:10:23 +01:00 |
Carlos Jimenez
|
3eaec1bba9
|
finished e2e path for botanical
|
2018-02-21 12:47:48 +01:00 |
|
Carlos Jimenez
|
0288e07638
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-21 12:37:02 +01:00 |
|
Daniel Herrero
|
8d5b329839
|
bug fixed in getModifiedData
|
2018-02-21 12:36:37 +01:00 |
|
Carlos Jimenez
|
47619ee971
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-21 12:03:05 +01:00 |
|
Carlos Jimenez
|
077d62ad9c
|
botanical e2e path
|
2018-02-21 12:02:47 +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 |
|
Carlos Jimenez
|
a88834ad56
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-21 11:05:33 +01:00 |
|
Carlos Jimenez
|
2f0f7a0ff2
|
updated a selector for vnItemProduct componenet
|
2018-02-21 11:03:55 +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 |
|
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 |