15362 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	365c209d9f	refs #5066 metodo getVehiclesSorted	2023-04-19 15:09:52 +02:00
Carlos Satorres	c69864aa3b	merge	2023-04-18 15:53:15 +02:00
Carlos Satorres	f13f02c829	refs #5066 e2e	2023-04-18 15:25:06 +02:00
Joan Sanchez	6f2aa0f618	Worker note ACL	2023-04-18 14:51:48 +02:00
Joan Sanchez	e0a8daf2f8	Merge pull request '4480-vnUser - Replaced model Account in favor of VnUser' (!1267) from 4480-vnUser into dev ... Reviewed-on: #1267	2023-04-18 09:52:24 +00:00
Joan Sanchez	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	a0d8ed1433	E2e fixes	2023-04-18 11:33:36 +02:00
Alexandre Riera	11b905138f	Merge pull request 'fixes #5418 Buscador lateral en item/fixed-price' (!1412) from 5418-buscador-lateral-fixed-price into dev ... Reviewed-on: #1412 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-18 08:49:53 +00:00
Alexandre Riera	2df362327f	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-18 08:33:15 +00:00
Alexandre Riera	e8e373d924	Merge pull request 'fixes #5518 Crear secciones de histórico para usuarios y roles' (!1446) from 5518-log-user-role into dev ... Reviewed-on: #1446 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-18 08:31:17 +00:00
Alexandre Riera	28a7722bb6	Merge branch 'dev' into 5518-log-user-role	2023-04-18 08:01:42 +00:00
Joan Sanchez	fded7d062b	section fix	2023-04-18 09:49:23 +02:00
Joan Sanchez	6fd5c8ae2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 08:34:20 +02:00
Joan Sanchez	d6fb05cc93	Merge pull request 'refs #5213 cambios e2e, descriptor' (!1437) from 5213-minorBugs2 into dev ... Reviewed-on: #1437 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 06:33:47 +00:00
Joan Sanchez	6d593a0937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2	2023-04-18 08:32:22 +02:00
Alex Moreno	2a8383f9cc	Merge pull request 'fix e2e' (!1450) from fix_e2e into dev	2023-04-17 12:19:26 +00:00
Joan Sanchez	06a845e7f0	Cambios SQL	2023-04-17 14:15:39 +02:00
Alex Moreno	6a0a08be95	typo	2023-04-17 13:03:09 +02:00
Alex Moreno	b5434c5e4e	tab	2023-04-17 12:58:55 +02:00
Alex Moreno	6144c24a44	fix(ticket_edit): fix e2e	2023-04-17 12:44:58 +02:00
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +02:00
Alex Moreno	f97d169cbf	observationEmail	2023-04-17 11:52:31 +02:00
Joan Sanchez	3ee29553b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 09:00:52 +02:00
Joan Sanchez	610f51aaf8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-17 08:59:49 +02:00
Joan Sanchez	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +02:00
Joan Sanchez	02c573bd23	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 08:57:24 +02:00
Joan Sanchez	51e42e485b	Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev ... Reviewed-on: #1372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 06:44:17 +00:00
Joan Sanchez	9e4c261a87	Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test ... Reviewed-on: #1440 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 05:39:57 +00:00
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Joan Sanchez	f4e696675d	Merge pull request 'reafactor(image): upload image using gm library' (!1445) from 5558-image_refactor into master ... Reviewed-on: #1445 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-15 11:07:44 +00:00
Juan Ferrer	ca3a1be20f	refs #4480 md5 removed from VnUser	2023-04-15 01:52:22 +02:00
Juan Ferrer	2af48b3049	refs #4480 Fix: VnUser before save hook removed -> setting password attribute	2023-04-15 01:51:38 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Carlos Satorres	e13ecabddf	refs #5066 back y html	2023-04-14 15:23:10 +02:00
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +02:00
Joan Sanchez	6e7b452792	Max quality	2023-04-14 13:19:17 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Alexandre Riera	b9b52c6b1d	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-14 07:08:02 +00:00
Carlos Satorres	fcf7ac0ad7	Merge branch '5066-order-vehicle-by-warehouse' of https://gitea.verdnatura.es/verdnatura/salix into 5066-order-vehicle-by-warehouse	2023-04-14 08:24:59 +02:00
Carlos Satorres	be5cff6a22	refs #5066 implementacion warehouse	2023-04-14 08:24:55 +02:00
Alexandre Riera	ecac5fffd4	Merge pull request 'fixes #5546 Actualizar código de registro de histórico de los modelos' (!1436) from 5546-codigo-registro into dev ... Reviewed-on: #1436 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-14 05:32:11 +00:00
Juan Ferrer	b4ef49cf24	Merge branch 'dev' into 5546-codigo-registro	2023-04-13 16:48:11 +00:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00
Carlos Satorres	a1efb356a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-order-vehicle-by-warehouse	2023-04-13 14:07:16 +02:00
Carlos Satorres	a2ddbd8a66	refs #5284 test update	2023-04-13 14:04:10 +02:00
Alexandre Riera	025c158b27	refs #5418 minor fixes	2023-04-13 13:52:11 +02:00
Joan Sanchez	7a02a3213a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-13 13:47:34 +02:00
Joan Sanchez	6d5167ab7f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-13 13:47:18 +02:00
Alexandre Riera	ac4772e44e	refs #5418 mistake doing git pull origin dev	2023-04-13 13:46:29 +02:00