3496 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	577c21e601	Merge branch 'dev' into 6321_negative_tickets	2024-05-28 12:48:00 +02:00
Alex Moreno	c88934218a	Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev ... Reviewed-on: #409 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-28 10:20:52 +00:00
Alex Moreno	d15f31de03	Merge branch 'dev' into 7494-icons	2024-05-28 10:19:49 +00:00
Alex Moreno	93fb3096e0	feat: refs #7494 new icons	2024-05-28 12:17:51 +02:00
Alex Moreno	35f7a6036e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-28 12:13:06 +02:00
Alex Moreno	2c307e5f29	deploy: fix e2e after db deploy	2024-05-28 12:12:31 +02:00
Alex Moreno	9f18c12c33	feat: refs #7494 new icons	2024-05-28 08:56:59 +02:00
Alex Moreno	8304dcb0a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-28 07:48:51 +02:00
Alex Moreno	75e9bc42aa	Merge pull request '7489-testToMaster' (!408) from 7489-testToMaster into master ... Reviewed-on: #408 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-28 05:33:16 +00:00
Javier Segarra	47248680ba	test: #7489 Fix VnLocation.spec.js	2024-05-27 18:35:34 +02:00
Alex Moreno	3ae523ef04	test(WorkerList): refs #7589 fix e2e	2024-05-27 16:52:53 +02:00
Alex Moreno	f7a6e3d471	test(ClaimPhoto): refs #7589 fix e2e	2024-05-27 16:13:40 +02:00
Carlos Satorres	ff251fbb85	Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev ... Reviewed-on: #402 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-27 11:59:10 +00:00
Carlos Satorres	4162e040cc	Merge branch 'dev' into 7391-defaulterMods	2024-05-27 11:58:11 +00:00
Juan Ferrer	24c0a62edf	Merge branch 'test' into dev	2024-05-27 13:32:19 +02:00
Juan Ferrer	3a2b0e757a	ci: refs #7442 Kubernetes deploy	2024-05-27 13:31:40 +02:00
Javier Segarra	cedc3e5c83	Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev ... Reviewed-on: #407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-24 16:10:46 +00:00
Javier Segarra	5c711c1bcb	perf: 6957 add color as new shared variable	2024-05-24 14:34:57 +02:00
Javier Segarra	f25385961b	perf: 6957 change fetchedTags color	2024-05-24 14:34:44 +02:00
Carlos Satorres	c7d7ae5373	Merge pull request 'refs #7396 fix summary' (!406) from fix-basicDataWorker into dev ... Reviewed-on: #406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 12:02:11 +00:00
Javier Segarra	36d166ab44	feat: #6321 Split tickets	2024-05-24 13:52:51 +02:00
Carlos Satorres	ba5407310f	refs #7396 fix summary	2024-05-24 13:40:00 +02:00
Javier Segarra	1eedb6f79b	perf: #6321 updates	2024-05-24 11:54:31 +02:00
Javier Segarra	ceae5eaa9e	Merge branch 'dev' into 6321_negative_tickets	2024-05-24 11:21:06 +02:00
Carlos Satorres	f1c688af89	refs #7391 fix textarea	2024-05-24 10:08:10 +02:00
Alex Moreno	b531370e2c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-24 08:33:27 +02:00
Carlos Satorres	70e5b207e5	Merge pull request 'fix: refs #6095 add reFfk null on search' (!383) from 6095-add-refFk-null-on-search into dev ... Reviewed-on: #383 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:29:58 +00:00
Carlos Satorres	4bacc8d836	Merge branch 'dev' into 6095-add-refFk-null-on-search	2024-05-24 06:28:34 +00:00
Javier Segarra	515561b75d	Merge pull request '#6957: FetchedTags refactor template' (!382) from 6957_refactorFetechedTags into dev ... Reviewed-on: #382 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-24 06:18:24 +00:00
Javier Segarra	d015a2e217	Merge branch 'dev' into 6957_refactorFetechedTags	2024-05-24 08:15:11 +02:00
Javier Segarra	4b9e9a84c5	Merge pull request 'Zone Upcoming deliveries' (!381) from hyervoni/salix-front-mindshore:feature/UpcomingDeliveries into dev ... Reviewed-on: #381 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 06:14:43 +00:00
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
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
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
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