10971 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	837511a0ab	Merge branch 'Fix-InvoiceOutLostCode' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceOutLostCode	2025-02-27 09:18:18 +01:00
Jon Elias	6718fa9a3d	refactor: adjust translation to standardize it	2025-02-27 09:18:16 +01:00
Jon Elias	a0f1e91237	Merge branch 'dev' into Fix-InvoiceOutLostCode	2025-02-26 11:58:27 +00:00
Carlos Satorres	ce8126f5f2	Merge pull request 'fix: fix sctions' (!1400) from fix-workerSections into dev ... Reviewed-on: #1400 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-26 11:46:54 +00:00
Jon Elias	87d25c55b4	Merge branch 'dev' into fix-workerSections	2025-02-26 11:28:51 +00:00
Alex Moreno	60dfda5921	fix: revert cypress.config	2025-02-26 10:30:17 +01:00
Alex Moreno	ce30276c73	test: skip clientList e2e	2025-02-26 10:27:34 +01:00
Alex Moreno	ad267ed132	test: skip clientList e2e	2025-02-26 10:26:41 +01:00
Alex Moreno	4d80d72c90	fix: update docker-compose command to remove volumes on teardown	2025-02-26 10:02:12 +01:00
Alex Moreno	4593fda04e	test: skip workerCreate e2e	2025-02-26 09:37:29 +01:00
Jon Elias	6bb9c43fa5	Merge branch 'dev' into Fix-InvoiceOutLostCode	2025-02-26 07:51:02 +00:00
Alex Moreno	6525e8907f	refactor: remove unused variables	2025-02-26 07:37:12 +01:00
Alex Moreno	8f77b16953	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-26 07:32:12 +01:00
PAU ROVIRA ROSALENY	7ab161b7f1	Merge pull request 'fix: #8593 fixed parking e2e tests' (!1392) from 8593-parkingTestsE2e into dev ... Reviewed-on: #1392 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-26 06:30:33 +00:00
PAU ROVIRA ROSALENY	d2b5ebfa6a	Merge branch 'dev' into 8593-parkingTestsE2e	2025-02-26 06:16:22 +00:00
Jon Elias	88b6f99236	fix: added lost code	2025-02-25 14:40:41 +01:00
Javier Segarra	5372742d51	Merge pull request 'warmfix: #7451 descriptorProxy dataKey' (!1496) from warmfix_descriptorProxy_dataKey into test ... Reviewed-on: #1496 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-25 13:07:50 +00:00
Javier Segarra	c41a999f9b	Merge branch 'test' into warmfix_descriptorProxy_dataKey	2025-02-25 13:06:51 +00:00
Carlos Satorres	ef85c2cfa2	Merge pull request 'fix: workerBasicData' (!1484) from warmfix-workerBasicDataFix into test ... Reviewed-on: #1484 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-25 13:02:20 +00:00
Javier Segarra	4910970ffe	Merge branch 'test' into warmfix_descriptorProxy_dataKey	2025-02-25 12:59:30 +00:00
Carlos Satorres	cbdae5de52	Merge branch 'test' into warmfix-workerBasicDataFix	2025-02-25 12:58:51 +00:00
Carlos Satorres	4901bfae34	Merge branch 'dev' into fix-workerSections	2025-02-25 12:58:35 +00:00
Javier Segarra	df62ccee8b	feat: detect when is descriptor proxy	2025-02-25 13:50:07 +01:00
Javier Segarra	e4e57127a0	fix: add datakey	2025-02-25 13:49:54 +01:00
Alex Moreno	a69e697edb	refactor: remove default browser setting from Cypress configuration	2025-02-25 12:53:49 +01:00
Alex Moreno	3a559d37b5	Merge pull request 'Warmfix[AccountDescriptorMenu]: fixed account descriptor menu' (!1488) from Warmfix-AccountDescriptorMenu into test ... Reviewed-on: #1488 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-25 11:43:07 +00:00
PAU ROVIRA ROSALENY	bca31ea896	Merge branch 'dev' into 8593-parkingTestsE2e	2025-02-25 11:10:52 +00:00
Jon Elias	a99faf17bb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu	2025-02-25 11:57:43 +01:00
Javi Gallego	430995a399	refactor: update labels and conditions in Claim components	2025-02-25 11:49:12 +01:00
Alex Moreno	cc0067a57a	fix: merge revert	2025-02-25 11:33:28 +01:00
Pablo Natek	5585367ab7	Merge pull request 'refactor: refs #6897 update VnTable components for improved value handling and UI adjustments' (!1480) from 6897-minorFixes into test ... Reviewed-on: #1480 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-25 09:48:36 +00:00
Alex Moreno	efd1c1fe87	Merge branch 'test' into 6897-minorFixes	2025-02-25 09:13:03 +00:00
Carlos Satorres	62024ce100	Merge branch 'dev' into fix-workerSections	2025-02-25 09:03:17 +00:00
Alex Moreno	0b3e8dedf9	fix: merge revert	2025-02-25 09:56:16 +01:00
Alex Moreno	1e8c6a61f6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-25 09:54:35 +01:00
Carlos Satorres	8fac1775b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix-workerSections	2025-02-25 09:54:26 +01:00
Alex Moreno	d72e45918a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-25 09:53:10 +01:00
Alex Moreno	c67ae3e17e	Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" ... This reverts commit 223a1ea449.	2025-02-25 09:53:02 +01:00
Carlos Satorres	e1851d9b5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix-workerSections	2025-02-25 09:47:11 +01:00
Pablo Natek	dc3721f62c	Merge pull request 'Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"' (!1491) from fix_revert_revert into test ... Reviewed-on: #1491 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-25 08:45:13 +00:00
Alex Moreno	b9b5bd4c8a	Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" ... This reverts commit 223a1ea449.	2025-02-25 09:40:46 +01:00
Carlos Satorres	5e803782d3	Merge pull request 'fix: refs #6553 workerBusiness' (!1469) from 6553-fixWorkerBusinessV2 into test ... Reviewed-on: #1469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-25 08:14:19 +00:00
Carlos Satorres	be858f8134	Merge branch 'test' into 6553-fixWorkerBusinessV2	2025-02-25 08:10:08 +00:00
Javier Segarra	c07fd2d2a5	Merge pull request 'HOTFIX: maxium calls exceed' (!1490) from hotfix_customerBalance_newPayment into master ... Reviewed-on: #1490 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-25 08:06:02 +00:00
Javier Segarra	d95b6c1a31	Merge branch 'master' into hotfix_customerBalance_newPayment	2025-02-25 07:36:07 +00:00
Javier Segarra	ade32272b4	Merge pull request 'HOTFIX: mana axios deacoplate' (!1489) from hotfix_mana_deacoplate into master ... Reviewed-on: #1489 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-25 07:35:51 +00:00
Jon Elias	c84225aed5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu	2025-02-25 08:07:40 +01:00
Alex Moreno	f2eedce55f	fix: merge test to dev	2025-02-25 08:01:10 +01:00
Alex Moreno	c89178e6a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-25 07:23:18 +01:00
PAU ROVIRA ROSALENY	b76bf88d24	Merge branch 'dev' into 8593-parkingTestsE2e	2025-02-25 06:04:48 +00:00