11970 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7899f7903f	test: fix intermitent e2e	2025-03-14 12:41:26 +01:00
Alex Moreno	0c2127f63f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-14 12:15:22 +01:00
Alex Moreno	7521d506b5	test: skip reserved row marking and unmarking tests in ticketSale.spec.js	2025-03-14 12:15:20 +01:00
Javier Segarra	37e1b0a04b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-14 12:12:32 +01:00
Javier Segarra	8bde3e4425	test: skip as reserved tests	2025-03-14 12:12:29 +01:00
Alex Moreno	1e84695a51	test: skip reserved row marking and unmarking tests in ticketSale.spec.js	2025-03-14 12:12:16 +01:00
Alex Moreno	51223e6cb4	feat: update Jenkinsfile to pull Docker images for back and db services	2025-03-14 11:40:19 +01:00
Alex Moreno	a83fecc706	chore: add junit-merge dependency to package.json	2025-03-14 08:02:13 +01:00
Alex Moreno	23f04dae1a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-14 07:05:11 +01:00
Alex Moreno	c1f5a9ab4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-14 07:04:50 +01:00
Javi Gallego	7129c236dd	Merge pull request 'refs #6802 Clientes-gestionados-por-equipos' (!1320) from 6802-Clientes-gestionados-por-equipos into dev ... Reviewed-on: #1320 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-13 17:09:29 +00:00
Carlos Andrés	11b5a63fa1	Merge pull request 'feat: refs #8700 add external reference display in InvoiceOutDescriptor' (!1594) from 8700-InvoiceOutRef into master ... Reviewed-on: #1594 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-13 16:21:48 +00:00
Jon Elias	af70429b52	Merge pull request 'revert: reverted issued field' (!1595) from Hotfix-InvocieOutListIssuedField into master ... Reviewed-on: #1595 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-03-13 15:44:07 +00:00
Jon Elias	2755a0b7d9	Merge branch 'master' into Hotfix-InvocieOutListIssuedField	2025-03-13 15:28:50 +00:00
Jon Elias	7213e2d1fc	revert: reverted issued field	2025-03-13 16:12:13 +01:00
Carlos Andrés	422c8483b7	feat: refs #8700 add external reference display in InvoiceOutDescriptor	2025-03-13 15:03:33 +01:00
Alex Moreno	f151bbec59	test: skip intermitent e2e	2025-03-13 13:15:41 +01:00
Alex Moreno	5ff5926c23	feat: run.sh build neccessary images	2025-03-13 13:07:24 +01:00
Javi Gallego	1658168ea7	Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos	2025-03-13 10:09:48 +01:00
Javi Gallego	eac4315a05	Merge branch '6802-Clientes-gestionados-por-equipos' of https://gitea.verdnatura.es/verdnatura/salix-front into 6802-Clientes-gestionados-por-equipos	2025-03-13 10:05:55 +01:00
Javi Gallego	7a8dfab682	feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list	2025-03-13 10:05:52 +01:00
Javier Segarra	d5d4f63717	test: skip claimAction	2025-03-13 09:00:09 +01:00
Alex Moreno	142c39c8f4	refactor: update client ID input selector and remove viewport setting	2025-03-13 08:20:01 +01:00
Alex Moreno	a8bcefd0c5	Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos	2025-03-13 07:00:03 +00:00
Alex Moreno	5fbd57a177	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-13 07:57:54 +01:00
Alex Moreno	518cac6885	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-13 07:56:36 +01:00
Jose Antonio Tubau	d51afa01c9	Merge pull request 'fix: agency list filters' (!1581) from warmFix_8688-fixAgencyFilters into test ... Reviewed-on: #1581 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-03-13 06:15:39 +00:00
Jose Antonio Tubau	467586257f	Merge branch 'test' into warmFix_8688-fixAgencyFilters	2025-03-13 06:00:57 +00:00
Javi Gallego	345e9532e6	Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos	2025-03-12 16:16:29 +01:00
Javi Gallego	d8e3494251	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-12 13:30:10 +01:00
Javi Gallego	22952befa9	feat: update labels and add department selection in InvoiceOut filter and list	2025-03-12 13:30:07 +01:00
Javier Segarra	32fde59fba	Merge pull request 'fix: solve problem when discount is 0' (!1586) from hotfix_ticketSale_updateDiscountTo0 into master ... Reviewed-on: #1586 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-03-12 11:58:26 +00:00
Alex Moreno	d078969dd6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-12 12:48:07 +01:00
Alex Moreno	8f2865d7e2	chore: reduce page load timeout in Cypress configuration	2025-03-12 12:45:40 +01:00
Alex Moreno	9ca77ed3f1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-12 12:44:12 +01:00
Jose Antonio Tubau	8a3b9fe80d	Merge pull request 'feat: refs #8721 add ticket navigation and update route columns' (!1554) from 8721-addBtnToTicketsListOfRoute into dev ... Reviewed-on: #1554 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-12 11:42:38 +00:00
Javier Segarra	428a3bfb5c	Merge branch 'master' into hotfix_ticketSale_updateDiscountTo0	2025-03-12 11:40:56 +00:00
Jon Elias	9b2b488ca6	Merge pull request 'Hotfix[ZoneLocationsTree]: Fixed node fetching and adapted to back data' (!1589) from Hotfix-ZoneLocationsGetLeaves into master ... Reviewed-on: #1589 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-12 11:36:15 +00:00
Jon Elias	4900751bfc	chore: try fix cypress bug	2025-03-12 11:34:02 +01:00
Jose Antonio Tubau	deef93b0e9	Merge branch 'dev' into 8721-addBtnToTicketsListOfRoute	2025-03-12 10:33:41 +00:00
Jon Elias	5cb17fa4c9	chore: try fix cypress bug	2025-03-12 11:26:26 +01:00
Jon Elias	ee54b38271	chore: try fix cypress bug	2025-03-12 11:25:31 +01:00
Jose Antonio Tubau	75adb54761	Merge pull request 'test: refs #8659 enhance AgencyWorkCenter tests with data attributes and improved messages' (!1483) from 8659-fixAgencyWorkCenterE2eTest into dev ... Reviewed-on: #1483 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-12 10:20:05 +00:00
Jon Elias	7a36c10128	chore: try fix cypress bug	2025-03-12 11:15:02 +01:00
Alex Moreno	72e793dc47	Merge branch 'dev' into 8659-fixAgencyWorkCenterE2eTest	2025-03-12 10:09:11 +00:00
Jose Antonio Tubau	91efa3c631	Merge pull request 'refactor: refs #8630 add vehicle translations and enhance route list columns' (!1431) from 8630-refactorRouteSectionsAndLocalizations into dev ... Reviewed-on: #1431 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-03-12 10:08:52 +00:00
Jon Elias	c47e46dc5d	test: updated pageLoadTimeout	2025-03-12 11:04:26 +01:00
Jose Antonio Tubau	a109f54b7b	test: refs #8630 disable destination change tests for issue #8756	2025-03-12 10:31:29 +01:00
Jose Antonio Tubau	47ec11e880	Merge branch 'dev' into 8721-addBtnToTicketsListOfRoute	2025-03-12 09:07:38 +00:00
Javier Segarra	c89081fbb5	Merge branch 'hotfix_ticketSale_updateDiscountTo0' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ticketSale_updateDiscountTo0	2025-03-12 10:01:44 +01:00