Carlos Jimenez
|
9fd95bdc7e
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-26 13:25:04 +01:00 |
|
Carlos Jimenez
|
bf7fe7dcf0
|
e2e path for item tax
|
2018-02-26 13:24:47 +01:00 |
Juan
|
8a57dccad1
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-26 12:56:48 +01:00 |
|
Juan
|
eb582b51a9
|
Bug #132 solved
|
2018-02-26 12:56:42 +01:00 |
|
Carlos Jimenez
|
fb6577bc01
|
fixed error of empty object catch on switching section to item tags
|
2018-02-26 12:37:27 +01:00 |
Vicente Falco
|
268f4b3463
|
merge
|
2018-02-25 10:59:33 +01:00 |
|
Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +01:00 |
|
Vicente Falco
|
218cf55e86
|
merge
|
2018-02-23 14:20:00 +01:00 |
|
Vicente Falco
|
54240b7278
|
Jenkins
|
2018-02-23 14:19:28 +01:00 |
Juan Ferrer Toribio
|
bff00dc98e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 13:05:00 +01:00 |
|
Juan Ferrer Toribio
|
cfc4b01fb0
|
Item tax form and service
|
2018-02-23 13:04:44 +01:00 |
 Javi Gallego
|
f4a244398a
|
greuge con decimales y favicon
|
2018-02-23 12:51:36 +01:00 |
|
Juan Ferrer Toribio
|
0c1fa49708
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 12:00:18 +01:00 |
|
Juan Ferrer Toribio
|
fdf2f017a0
|
DB upgraded
|
2018-02-23 11:59:58 +01:00 |
|
Carlos Jimenez
|
398f66defc
|
e2e path for item clone
|
2018-02-23 09:42:19 +01:00 |
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +01:00 |
|
Vicente Falco
|
443c888d73
|
merge
|
2018-02-23 07:18:26 +01:00 |
|
Vicente Falco
|
b3d692aaa0
|
Docker nginx
|
2018-02-23 07:17:33 +01:00 |
|
Vicente Falco
|
a9d98b77f6
|
Docker nginx
|
2018-02-22 22:28:29 +01:00 |
|
Carlos Jimenez
|
8815dece66
|
removed focus from describe
|
2018-02-22 16:44:53 +01:00 |
|
Carlos Jimenez
|
bf751341c3
|
e2e path for item summary
|
2018-02-22 16:44:14 +01:00 |
|
Javi Gallego
|
51f8d01d24
|
Error de roles solucionado a falta de dump
|
2018-02-22 16:17:30 +01:00 |
|
Daniel Herrero
|
c2782a8682
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 13:40:31 +01:00 |
|
Daniel Herrero
|
10e47acd6b
|
item clonation finish
|
2018-02-22 13:40:23 +01:00 |
|
Carlos Jimenez
|
fe8f3a6660
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-22 11:26:51 +01:00 |
|
Carlos Jimenez
|
a9dfe8b19d
|
e2e path for item basic data
|
2018-02-22 11:26:32 +01:00 |
|
Daniel Herrero
|
91b7be32fb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 11:20:22 +01:00 |
|
Daniel Herrero
|
43eef84ecf
|
renamed item models to kebab-case
|
2018-02-22 11:20:08 +01:00 |
Bernat Exposito
|
f92c6faa22
|
fixed blocking errors on e2e due to snackbar restet time plus fixtures permisions
|
2018-02-22 10:03:58 +01:00 |
|
Daniel Herrero
|
e81d79610b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 08:19:11 +01:00 |
|
Daniel Herrero
|
b999254433
|
ItemSummary into dialog
|
2018-02-22 08:18:57 +01:00 |
|
Bernat Exposito
|
e377e9e452
|
update fixtures and mudole itemTag.json
|
2018-02-21 13:44:25 +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
|
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 |