Juan
|
eb582b51a9
|
Bug #132 solved
|
2018-02-26 12:56:42 +01:00 |
Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +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
|
fdf2f017a0
|
DB upgraded
|
2018-02-23 11:59:58 +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 |
|
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
|
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 |
|
Bernat Exposito
|
e377e9e452
|
update fixtures and mudole itemTag.json
|
2018-02-21 13:44:25 +01:00 |
|
Javi Gallego
|
41dfa9f9a1
|
creacion de ACL en diferentes modelos
|
2018-02-21 09:28:17 +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
|
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 |
|
Carlos Jimenez
|
6b70556320
|
acls are back to obersvation-type.json properties
|
2018-02-20 13:38:04 +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
|
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 |
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Carlos Jimenez
|
3abc4c7a68
|
backend unit test for crudItemBarcodes
|
2018-02-14 16:49:19 +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 |
|
Juan Ferrer Toribio
|
87dfa49692
|
Bugs with webpack assets solved
|
2018-02-14 12:52:24 +01:00 |
|
Juan Ferrer Toribio
|
e4595da2a7
|
E2E test partially fixed
|
2018-02-14 10:03:00 +01:00 |
|
Juan Ferrer Toribio
|
fd0d5b70be
|
Solved bug that caused main webpack assets incorrecly cached by browsers (Deployment should be tested)
|
2018-02-13 23:01:28 +01:00 |
|
Juan Ferrer Toribio
|
8be4e0fb1f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 22:40:17 +01:00 |