6624 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	e18d129b32	fix: refs #6242 merge conflicts	2024-10-24 12:56:33 +02:00
Alex Moreno	32b4636706	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-24 07:49:10 +02:00
Alex Moreno	f26976b744	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-24 07:49:01 +02:00
Javi Gallego	a0a37a68a0	Merge pull request '#8083 hotfix-insertRecord' (!859) from 8083-hotfix-insertRecord into master ... Reviewed-on: #859 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 14:25:00 +00:00
Jorge Penadés	1bfede4a55	fix: refs #8083 drop useless code	2024-10-23 16:13:32 +02:00
Jorge Penadés	4e31566ddd	fix: refs #8083 drop useless code	2024-10-23 16:13:04 +02:00
Jorge Penadés	33ee1ea01b	fix: refs #8083 drop useless code	2024-10-23 16:11:58 +02:00
Jorge Penadés	126bb3f039	feat: refs #8083 insert	2024-10-23 16:10:14 +02:00
Jorge Penadés	9673f7be1e	fix: refs #8083 update rightly	2024-10-23 15:17:06 +02:00
Alex Moreno	d1e4017869	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-23 13:59:11 +02:00
Alex Moreno	5d4b5ad598	Merge pull request 'fix: refs #8010 footer class' (!857) from 8010-fix_vnTable_footer_class into test ... Reviewed-on: #857 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-10-23 11:58:46 +00:00
Alex Moreno	0528474250	chore: refs #8010 kebab-case	2024-10-23 13:13:00 +02:00
Alex Moreno	e7acdfd4f7	fix: refs #8010 footer class	2024-10-23 10:48:30 +02:00
Javi Gallego	3cbd294168	Merge pull request '#7943 -permisosWorker' (!855) from 7349-permisosWorker into dev ... Reviewed-on: #855 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:52:48 +00:00
Javi Gallego	1bf1844c8f	fix: refs #7349 dependencia no usada	2024-10-23 07:46:52 +02:00
Javi Gallego	ae56c06628	feat: refs #7349 usa back con permisos	2024-10-23 07:45:00 +02:00
Alex Moreno	735ee09ef8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 15:08:20 +02:00
Alex Moreno	aaf749db6c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 15:08:11 +02:00
Alex Moreno	81a55a9e7a	chore: test gitea	2024-10-22 14:55:47 +02:00
Jorge Penadés	41509c60dd	Merge pull request '#8083 add change state btn' (!854) from 8083-hotfix-changeState into master ... Reviewed-on: #854 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-22 12:47:58 +00:00
Jorge Penadés	033d6bddbe	fix: refs #8083 move expeditions	2024-10-22 14:43:43 +02:00
Jorge Penadés	da4c1e9c12	fix: refs #8083 add order	2024-10-22 14:36:30 +02:00
Jorge Penadés	9f3c834ce4	Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState	2024-10-22 14:24:41 +02:00
Jorge Penadés	b1a511ff6f	fix: refs #8083 delete btn & redirect	2024-10-22 14:21:03 +02:00
Javi Gallego	93025007f1	Merge pull request '#7524 add my team filter' (!849) from 7524-hotfix-myTeamFilter into master ... Reviewed-on: #849 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-22 12:00:03 +00:00
Jorge Penadés	f751408de2	feat: refs #8083 add change state btn	2024-10-22 13:22:43 +02:00
Carlos Satorres	c799d17e19	Merge pull request '8144-devToTest_2444' (!852) from 8144-devToTest_2444 into test ... Reviewed-on: #852 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-22 08:55:43 +00:00
Alex Moreno	36221121f5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-22 07:43:07 +02:00
Alex Moreno	b4d4844100	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 07:42:54 +02:00
Jorge Penadés	0fbd5f45e1	fix: refs #7524 select department	2024-10-21 14:29:29 +02:00
Jon Elias	665e84d338	Merge pull request '#7356: Changes to fix ticket section' (!806) from Fix-TicketsModule into dev ... Reviewed-on: #806 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:41:08 +00:00
Jon Elias	cd4b17048c	Merge branch 'dev' into Fix-TicketsModule	2024-10-21 11:40:02 +00:00
Javier Segarra	bc1a082fe1	Merge pull request '#7679 Improve NewPostCodeForm' (!787) from 7679_improve_newPostcode_form into dev ... Reviewed-on: #787 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:17:47 +00:00
Javier Segarra	e5064e8a37	Merge branch 'dev' into 7679_improve_newPostcode_form	2024-10-21 11:17:01 +00:00
Javier Segarra	76b69a7588	Merge pull request '#6943 - Customer specs' (!822) from 6943_customer_spec into dev ... Reviewed-on: #822 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:14:58 +00:00
Javier Segarra	cdce4d063c	Merge branch 'dev' into 6943_customer_spec	2024-10-21 11:14:14 +00:00
Alex Moreno	fbd6633bdb	Merge pull request 'fix(TicketBasicData_zone): refs #6233 add acls and fix get zones' (!847) from 6233-fix_ticketBasicData_zone into dev ... Reviewed-on: #847 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 10:51:08 +00:00
Alex Moreno	0afcba0b07	Merge branch 'dev' into 6233-fix_ticketBasicData_zone	2024-10-21 10:49:43 +00:00
Alex Moreno	d61c690a70	Merge pull request 'feat(navBar): refs #7632 isLoading' (!844) from 7632-axios_isLoading into dev ... Reviewed-on: #844 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-21 10:48:57 +00:00
Jorge Penadés	a4358ec0ed	chore: refs #7524 refactor order	2024-10-21 12:36:16 +02:00
Jorge Penadés	2b2ccbc6a1	feat: refs #7524 myTeam filter & default params	2024-10-21 12:14:54 +02:00
Alex Moreno	d221b8e3c4	chore: refs #7632 change requests	2024-10-21 12:04:20 +02:00
Alex Moreno	fcc213f307	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7632-axios_isLoading	2024-10-21 12:03:15 +02:00
Jon Elias	2a7bebb0b6	Merge pull request 'Added new filter param and refactored link colors in item request' (!827) from Fix-ItemRequest into dev ... Reviewed-on: #827 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 09:35:07 +00:00
Alex Moreno	f2147311d3	fix(TicketBasicData_zone): refs #6233 add acls and fix get zones	2024-10-21 08:41:19 +02:00
Alex Moreno	0cc1090739	Merge branch 'dev' into 7632-axios_isLoading	2024-10-21 06:23:05 +00:00
Jon Elias	fbfb1c654a	Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule	2024-10-18 13:33:29 +02:00
Jon Elias	11092866b8	fix: merge conflicts	2024-10-18 13:33:28 +02:00
Jon Elias	64c0496f7a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:20:43 +00:00
Alex Moreno	f4caf6aecc	test: refs #7632 not use hash word	2024-10-18 11:06:06 +02:00