3460 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	cabee09052	Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries	2024-05-24 08:13:40 +02:00
Javier Segarra	286fe0d20c	Merge branch 'dev' into feature/UpcomingDeliveries	2024-05-24 08:13:37 +02:00
Alex Moreno	f12c9d5a9e	refactor: add flat	2024-05-24 07:55:54 +02:00
Carlos Satorres	a603f37144	refs #7391 fix textarea	2024-05-23 15:54:57 +02:00
Carlos Satorres	4bf4d754a2	Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev ... Reviewed-on: #264 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:48:28 +00:00
Carlos Satorres	6388f08ffb	Merge branch 'dev' into 6111-modsRouteList	2024-05-23 12:47:38 +00:00
Pablo Natek	92c7109290	Merge pull request 'fix: refs #7187 fix responsive' (!393) from 7187-fix-workerPda into test ... Reviewed-on: #393 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:43:34 +00:00
Pablo Natek	0896ae24d2	Merge branch 'test' into 7187-fix-workerPda	2024-05-23 12:42:54 +00:00
Carlos Satorres	0dfd00dbfc	Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev ... Reviewed-on: #391 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:39:51 +00:00
Carlos Satorres	bfdd319366	Merge branch 'dev' into 6332-calendarMods	2024-05-23 12:36:36 +00:00
Pablo Natek	410012df55	fix: refs #7187 fix div	2024-05-23 14:24:58 +02:00
Javier Segarra	889263bfb8	feat: roleCreate as dialog	2024-05-23 13:47:14 +02:00
Carlos Satorres	8b8033cb3d	refs #6095 remove limit	2024-05-23 13:21:54 +02:00
Carlos Satorres	74f25f54ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search	2024-05-23 11:55:49 +02:00
Carlos Satorres	2432a37211	refs #6111 fix sticky	2024-05-23 10:26:54 +02:00
Carlos Satorres	6ea942bf31	refs #6111 fix merge, fix column	2024-05-23 09:24:50 +02:00
Carlos Satorres	66c841114b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList	2024-05-23 09:23:11 +02:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00
Javier Segarra	06664cc2d0	feat: newRole	2024-05-23 08:52:57 +02:00
Jon Elias	406c095ed2	Merge pull request '#6652 improved defaulter section' (!394) from 6652-improveCustomerDefaulter into dev ... Reviewed-on: #394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 06:34:59 +00:00
Jon Elias	566ef90cbe	Merge branch 'dev' into 6652-improveCustomerDefaulter	2024-05-23 06:34:10 +00:00
Javier Segarra	722f1e8a03	Merge branch 'dev' into feature/ZoneLocations	2024-05-22 14:00:06 +00:00
William Buezas	e43485f19c	resolve conflict	2024-05-22 10:57:33 -03:00
William Buezas	1347e4ec40	Handle params search on mounted	2024-05-22 10:56:37 -03:00
Carlos Satorres	1a4d8bb0c0	Merge pull request '6820-changeKmroute' (!395) from 6820-changeKmroute into dev ... Reviewed-on: #395 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 13:56:18 +00:00
Javier Segarra	e2b72f132c	Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations	2024-05-22 15:49:23 +02:00
Javier Segarra	3fded533a6	perf: remove local tree variable	2024-05-22 15:49:11 +02:00
William Buezas	f4807d887f	Improve node management when using search bar	2024-05-22 10:20:36 -03:00
Carlos Satorres	6b474bfd06	Merge branch 'dev' into 6820-changeKmroute	2024-05-22 12:53:40 +00:00
Carlos Satorres	e4ebf4c4db	refs #6820 fix traduction	2024-05-22 13:44:53 +02:00
Carlos Satorres	2746ea7f5e	Merge pull request 'remove right' (!389) from fix-CalendarTimeControlRightPanel into dev ... Reviewed-on: #389 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 10:56:10 +00:00
Carlos Satorres	499e104daa	Merge branch 'dev' into fix-CalendarTimeControlRightPanel	2024-05-22 10:49:43 +00:00
Carlos Satorres	506b5dd9c2	refs #6820 fix error front	2024-05-22 12:24:08 +02:00
Carlos Satorres	98449b0c1e	refs #6111 scroll horizontal	2024-05-22 10:23:10 +02:00
Javier Segarra	d900ed3764	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 10:22:05 +02:00
Javier Segarra	f6051472ef	style: color transparent when is fetive	2024-05-22 10:21:06 +02:00
Jon Elias	77e3104047	Merge branch 'dev' into 6652-improveCustomerDefaulter	2024-05-22 08:10:52 +00:00
Jon Elias	2af4df8ded	refactor: refs #6652 improved defaulter section	2024-05-22 10:07:58 +02:00
Carlos Satorres	c1bcc0379d	refs #6332 fix festive	2024-05-22 09:35:56 +02:00
Javier Segarra	eaa0288f25	update	2024-05-22 09:27:48 +02:00
Javier Segarra	a0ca26ad9b	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:56:10 +02:00
Javier Segarra	0e0f649ff9	fix: 9-12	2024-05-22 08:54:37 +02:00
Carlos Satorres	81f7e06143	refs #6332 fix calendar	2024-05-22 08:35:01 +02:00
Javier Segarra	3d6fac5338	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:28:51 +02:00
Javier Segarra	2094506baf	fix: WorkerCalendarItem	2024-05-22 08:27:09 +02:00
Alex Moreno	56804900d9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-22 08:05:23 +02:00
Alex Moreno	d466e9f70a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-22 08:05:05 +02:00
Alex Moreno	f3c334b826	hotFix(VnDmsList): downloadModel default undefined	2024-05-22 08:02:59 +02:00
Javier Segarra	ad328d9c51	Merge branch 'dev' into 6957_refactorFetechedTags	2024-05-22 00:00:58 +02:00
Pablo Natek	d2d80645d0	fix: refs #7187 fix responsive	2024-05-21 19:12:40 +02:00