15326 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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	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	a2ddbd8a66	refs #5284 test update	2023-04-13 14:04:10 +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
Carlos Satorres	90268a79b0	refs #5284 test createClaim	2023-04-13 13:41:10 +02:00
Alexandre Riera	f4491cb263	Merge pull request 'fixes #5379 Dejar de hacer referencia a vn2008 en salix' (!1425) from 5379-quitar-referencia-vn2008 into dev ... Reviewed-on: #1425 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-13 06:46:06 +00:00
Carlos Satorres	15d7139bc5	Merge branch '5284-fueraPlazo' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo	2023-04-13 08:45:06 +02:00
Alexandre Riera	71e202d586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro	2023-04-13 08:45:05 +02:00
Carlos Satorres	44eab101cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo	2023-04-13 08:44:56 +02:00
Alexandre Riera	40333a2ff4	Merge branch 'dev' into 5379-quitar-referencia-vn2008	2023-04-13 06:40:07 +00:00
Joan Sanchez	eb1798100f	Added version 23.16	2023-04-13 08:16:06 +02:00
Alexandre Riera	534a58409f	Merge branch 'dev' into 5379-quitar-referencia-vn2008	2023-04-13 05:42:10 +00:00
Juan Ferrer	847d0f6c43	Merge pull request 'fixes #5522 Loggable - Deadlock en inserción múltiple' (!1430) from 5522-loggable-deadlock into dev ... Reviewed-on: #1430 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-12 15:43:30 +00:00
Juan Ferrer	520d5ab55c	Merge branch 'dev' into 5379-quitar-referencia-vn2008	2023-04-12 15:34:15 +00:00
Juan Ferrer	7e1d6f4339	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-12 15:33:23 +00:00
Alexandre Riera	eed57c9b4e	refs #5546 removed log tests	2023-04-12 14:47:07 +02:00
Carlos Satorres	ef6e85532e	refs #5213 cambios e2e, descriptor	2023-04-12 14:20:05 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Alexandre Riera	32c5ced55b	Merge pull request 'hotfix rollback delivery.sql' (!1435) from hotfix-rollback-delivery into master ... Reviewed-on: #1435	2023-04-11 13:06:59 +00:00
Alexandre Riera	245b0e70f4	hotfix rollback delivery.sql	2023-04-11 14:51:39 +02:00
Pablo Natek	736d0375f6	Merge pull request 'refs #5211' (!1385) from 5211-cleanItemShelvings into dev ... Reviewed-on: #1385 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-04-11 12:08:54 +00:00
Pablo Natek	ccf26c5413	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-11 11:56:33 +00:00
Joan Sanchez	a4126eca56	Merge pull request 'hotfix-apply-changes-procedure' (!1434) from hotfix-apply-changes-procedure into master ... Reviewed-on: #1434 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 11:27:34 +00:00
Alexandre Riera	3ee08e0300	changed folder	2023-04-11 12:34:26 +02:00
Alexandre Riera	c6db5f1a4b	hotfix apply changes procedure	2023-04-11 12:29:09 +02:00
Joan Sanchez	0d4c2db0ac	Merge pull request 'hotfix apply SQL delivery.sql' (!1433) from hotfix-moveSQL-minorVersion-delivery into master ... Reviewed-on: #1433 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 09:28:06 +00:00