13248 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	289f5ce404	refactor: refs #8363 translations and fixed popup	2025-04-10 08:56:05 +02:00
Jon Elias	b7ed24dd72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice	2025-04-10 08:17:09 +02:00
Jon Elias	15c8f4ac43	Merge pull request 'Fix: InvoiceInList E2E' (!1694) from Fix-InvoiceInListE2E into dev ... Reviewed-on: #1694 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-10 06:12:57 +00:00
Jon Elias	659050700b	fix: fixed and skipped e2e	2025-04-10 08:08:46 +02:00
Jon Elias	6f4b618a7f	fix: fixed e2e	2025-04-09 16:45:38 +02:00
Jon Elias	eb4340122d	fix: fixed e2e	2025-04-09 16:44:11 +02:00
Alex Moreno	eab1994fb8	fix(find-imports): remove the specific one if the module is there	2025-04-09 11:21:00 +02:00
Jon Elias	6a129c89d7	perf: refs #8363 e2e intermittence	2025-04-09 09:54:15 +02:00
Jon Elias	955c4718dd	Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice	2025-04-09 08:50:13 +02:00
Jon Elias	96b20f6711	fix: refs #8363 conflicts	2025-04-09 08:50:11 +02:00
Alex Moreno	ac7fab7ada	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-09 07:41:26 +02:00
Javier Segarra	4399217b4b	Merge pull request 'InvoiceOut change columns order' (!1415) from minor_requested_changes_invoiceOutList into dev ... Reviewed-on: #1415	2025-04-08 13:29:12 +00:00
Javier Segarra	3edd00d500	Merge pull request 'Add `vitest ui` as devDependency' (!1688) from vitest_ui into dev ... Reviewed-on: #1688 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 13:24:42 +00:00
Javier Segarra	6f938021bf	Merge branch 'dev' into minor_requested_changes_invoiceOutList	2025-04-08 13:10:43 +00:00
Alex Moreno	9d00668acb	Merge pull request 'hotFix_vnJsonValue_showHours' (!1689) from hotFix_vnJsonValue_showHours into master ... Reviewed-on: #1689 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-04-08 13:00:58 +00:00
Javier Segarra	7e56cb96ef	Merge pull request '#8725 - submit_form_onClick' (!1564) from 8725_submit_form_onClick into dev ... Reviewed-on: #1564 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 12:58:50 +00:00
Javier Segarra	87925d3fad	Merge branch 'dev' into vitest_ui	2025-04-08 12:57:32 +00:00
Javier Segarra	36ff68900f	Merge pull request 'test: #7356 Ticket e2e' (!1531) from 7356_e2e into dev ... Reviewed-on: #1531 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 12:31:23 +00:00
Alex Moreno	e081543d39	Merge branch 'master' into hotFix_vnJsonValue_showHours	2025-04-08 12:19:43 +00:00
Javier Segarra	77e01ed55c	Merge branch 'dev' into vitest_ui	2025-04-08 12:14:30 +00:00
Alex Moreno	a2f8a61c20	fix(WorkerPDA): fetching available PDA data when add and remove pda	2025-04-08 14:11:43 +02:00
Javier Segarra	a24bc6cc4b	Merge branch 'dev' into 7356_e2e	2025-04-08 12:09:48 +00:00
Alex Moreno	9d2c0bf211	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 13:34:01 +02:00
Alex Moreno	123ec41f32	fix(WorkerCalendarFilter): fix style year and contract filter	2025-04-08 13:32:31 +02:00
Javier Segarra	d6362d042d	Merge branch 'dev' into 8725_submit_form_onClick	2025-04-08 11:31:00 +00:00
Javier Segarra	1b695be63f	feat: add vitest ui devDependency	2025-04-08 13:30:22 +02:00
Alex Moreno	d3b413fc25	Merge branch 'dev' into 7356_e2e	2025-04-08 11:19:33 +00:00
Javier Segarra	1e1096a108	Merge pull request 'fix: FilterPanel when is multiline and VnTable vh on n toolbar' (!1657) from fix_itemFilter_multiLine into dev ... Reviewed-on: #1657 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 10:17:23 +00:00
Javier Segarra	9d31a75dfe	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-08 10:00:52 +00:00
Javier Segarra	af0c30f798	test: refs #8725 add save action to form model popup	2025-04-08 11:57:21 +02:00
Javier Segarra	9cadb4a02b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick	2025-04-08 11:12:22 +02:00
Javier Segarra	3c6bed6d7e	Merge pull request '#8446 - update_vitest_version to 2.0.0' (!1127) from update_vitest_version into dev ... Reviewed-on: #1127 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 08:09:34 +00:00
Javier Segarra	af4a398a90	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-08 07:50:56 +00:00
Javier Segarra	d91d5351c3	Merge branch 'dev' into update_vitest_version	2025-04-08 07:48:18 +00:00
Alex Moreno	c9957371df	Merge branch 'master' into hotFix_vnJsonValue_showHours	2025-04-08 06:58:44 +00:00
Alex Moreno	15cbbab043	fix(WorkerPDA): fix translations	2025-04-08 08:35:27 +02:00
Alex Moreno	2a3e8f293a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 08:28:17 +02:00
Alex Moreno	ffd83e7e0f	fix(WorkerPDA): use observation field	2025-04-08 08:27:51 +02:00
Alex Moreno	72d9f9345c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 07:24:04 +02:00
Alex Moreno	e0ba8ab742	refactor: rollback	2025-04-08 07:22:12 +02:00
Javier Segarra	2cb151e181	fix: update pnpm-lock.yaml	2025-04-07 17:43:06 +02:00
Javier Segarra	5e9fe20f08	Merge branch 'update_vitest_version' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version	2025-04-07 15:35:19 +02:00
Javier Segarra	dc93d1d394	Merge branch 'dev' into update_vitest_version	2025-04-07 15:35:14 +02:00
Javier Segarra	1fc9dc1ca6	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-07 13:27:30 +00:00
Alex Moreno	2d129dde01	fix: enable Jenkins find changes	2025-04-07 14:14:22 +02:00
Alex Moreno	d142797b1f	fix: update Jenkinsfile to remove unused module retrieval and modify cypressParallel.sh invocation	2025-04-07 14:03:43 +02:00
Alex Moreno	2b5802a7fb	fix: update cypressParallel.sh invocation to use an empty string for modules	2025-04-07 14:01:51 +02:00
Alex Moreno	3549f172d6	fix: pass modules as argument to cypressParallel.sh in Jenkinsfile	2025-04-07 14:01:37 +02:00
Jon Elias	b782da7a8d	Merge branch 'dev' into 8363-RefactorItemFixedPrice	2025-04-07 11:47:04 +00:00
Alex Moreno	d6363e4b45	fix: temporal fix	2025-04-07 13:36:43 +02:00