Juan
|
9881c4e6f3
|
Merge
|
2018-03-01 14:04:33 +01:00 |
|
Juan
|
de145bd814
|
#128 - Client invoices form
|
2018-03-01 14:01:45 +01:00 |
 Joan Sanchez
|
52503c1015
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 13:53:16 +01:00 |
|
Joan Sanchez
|
5dc7b0bb58
|
Client summary
|
2018-03-01 13:53:11 +01:00 |
Daniel Herrero
|
77b20ae764
|
clientIndex unit test fixed
|
2018-03-01 13:26:54 +01:00 |
|
Daniel Herrero
|
a78292ffb8
|
merge conflicts
|
2018-03-01 12:55:07 +01:00 |
|
Daniel Herrero
|
b92f8bdd43
|
tarea #105 esturcctura montada, falta rellenar datos
|
2018-03-01 12:51:35 +01:00 |
 Javi Gallego
|
4ee4c07b19
|
Bug #125 Modelo item
|
2018-03-01 12:47:51 +01:00 |
|
Javi Gallego
|
c8eab7dc24
|
merge model-config
|
2018-03-01 11:57:33 +01:00 |
|
Javi Gallego
|
f3b00f4b47
|
entidad recovery con list, create y tests
|
2018-03-01 11:55:28 +01:00 |
|
Juan
|
3d4ff56888
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 11:36:48 +01:00 |
|
Daniel Herrero
|
465d210b51
|
bug 103 falcar cliente, acl condicionales
|
2018-03-01 10:54:02 +01:00 |
|
Juan
|
e6c44d74eb
|
Client invoices
|
2018-02-28 20:55:44 +01:00 |
|
Juan
|
b3037e2db9
|
Addresses E2E fixed
|
2018-02-28 13:07:58 +01:00 |
|
Juan
|
d9c54415cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-28 12:07:59 +01:00 |
|
Juan
|
a1ee22d153
|
#96 - Email validation errors fixed
|
2018-02-28 12:07:56 +01:00 |
|
Daniel Herrero
|
50fb035dd9
|
Bug #108 tooltip outsides
|
2018-02-28 09:12:48 +01:00 |
|
Juan
|
8ee649b9d0
|
Bug with empty value validations fixed
|
2018-02-27 22:50:14 +01:00 |
Carlos Jimenez
|
cf77d05156
|
fixed a merge conflit problem
|
2018-02-27 14:39:50 +01:00 |
|
Carlos Jimenez
|
cdfc2a6779
|
solved merge comflics with item tags
|
2018-02-27 13:40:33 +01:00 |
|
Carlos Jimenez
|
701e6f9976
|
completed task #144 tem tags bugs
|
2018-02-27 13:31:45 +01:00 |
|
Juan
|
688881fac4
|
Bug #97 - Show dash when no secured credit
|
2018-02-27 13:28:07 +01:00 |
|
Carlos Jimenez
|
33f19949d8
|
fixed item tags plus added watcher to niches
|
2018-02-27 12:32:47 +01:00 |
|
Daniel Herrero
|
5b928f3e04
|
itemtags i18n
|
2018-02-27 08:14:28 +01:00 |
|
Daniel Herrero
|
687b011f9a
|
minWatcher in tags
|
2018-02-27 08:09:51 +01:00 |
|
Daniel Herrero
|
e048402223
|
itemTag added priority
|
2018-02-27 07:54:41 +01:00 |
|
Carlos Jimenez
|
4e5cbef155
|
corrected error message when tags are repeated
|
2018-02-26 17:34:40 +01:00 |
|
Carlos Jimenez
|
456e63700f
|
removed unused code from item niche
|
2018-02-26 17:32:23 +01:00 |
|
Carlos Jimenez
|
c0106b11d2
|
fixed BUG in #123 item tags
|
2018-02-26 16:49:44 +01:00 |
|
Juan
|
f9d6d63b6b
|
#124 Validación de la description en observaciones de direcciones
|
2018-02-26 14:23:26 +01:00 |
|
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 |
|
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +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
|
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 |
|
Daniel Herrero
|
087b1d9a61
|
refactor zoomImage
|
2018-02-14 09:21:43 +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 |
|
Juan Ferrer Toribio
|
72830652b4
|
Documented Gulpfile, improved 'docker-wait' to handle errors
|
2018-02-13 22:40:02 +01:00 |
|
Javi Gallego
|
595cbfbed6
|
quitado el antiguo campo de iva
|
2018-02-13 14:19:06 +01:00 |
|
Javi Gallego
|
a50c3d565e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 13:29:28 +01:00 |
|
Daniel Herrero
|
5565b7daa4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 13:15:17 +01:00 |
|
Daniel Herrero
|
d964f7efaa
|
SPR1.3 TASK#36 - zoom image
|
2018-02-13 13:15:03 +01:00 |
|
Carlos Jimenez
|
c99f22430b
|
mini refactor filter panel
|
2018-02-13 11:41:39 +01:00 |
|
Carlos Jimenez
|
0bcc638af7
|
mini refactor on address edit
|
2018-02-13 09:32:07 +01:00 |
|
Juan Ferrer Toribio
|
4c76718bce
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-12 13:17:00 +01:00 |
|
Juan Ferrer Toribio
|
c4b184e5e8
|
vnCheck componentized, Client style changes
|
2018-02-12 13:16:49 +01:00 |
|
Javi Gallego
|
b5db0abbf1
|
Creacion sin relevancy y acl de clientObservation
|
2018-02-12 12:02:00 +01:00 |
|
Carlos Jimenez
|
813e160499
|
pagination for item log plus more fixtures
|
2018-02-12 12:01:39 +01:00 |
|
Juan Ferrer Toribio
|
88d50e3d00
|
Core refactor, first step
|
2018-02-10 16:18:01 +01:00 |