4388 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	93c109b70d	refactor: new translations	2024-06-28 11:25:38 +02:00
Javier Segarra	68552b8da9	perf: add QBtn in CardDescriptor instead each ModuleDescriptor	2024-06-28 11:07:32 +02:00
Jon Elias	8e9b238eaa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations	2024-06-28 10:58:57 +02:00
Jon Elias	369cb9dc75	refactor: refs #7030 added translations	2024-06-28 10:56:09 +02:00
Jorge Penadés	e8ade1fd1d	Merge branch '7436-showQCheckbox' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox	2024-06-28 10:21:50 +02:00
Jorge Penadés	97c84f7aaa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox	2024-06-28 10:21:47 +02:00
Jorge Penadés	86a016e375	Merge pull request '#7433 fix skeleton' (!493) from 7433-fixSkeleton into dev ... Reviewed-on: #493 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 08:19:46 +00:00
Jon Elias	ec5eeaa308	fix: refs #6151 fixed filters and styles	2024-06-28 10:14:24 +02:00
Jorge Penadés	2b7f3990ab	Merge branch '7433-fixSkeleton' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton	2024-06-28 09:57:02 +02:00
Jorge Penadés	2c5db9716d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton	2024-06-28 09:56:57 +02:00
Jorge Penadés	b8aee9738d	Merge branch 'dev' into 7433-fixSkeleton	2024-06-28 07:53:15 +00:00
Alex Moreno	ebaaba6079	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime	2024-06-28 08:37:54 +02:00
Alex Moreno	eb3eaaa4db	fix: revert cypress mjs	2024-06-28 08:37:39 +02:00
Alex Moreno	8b55acf667	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime	2024-06-28 08:35:28 +02:00
Alex Moreno	ba5af7258f	Merge pull request 'Revert "feat: fixes #7196"' (!496) from 7196-revertCJS into dev ... Reviewed-on: #496 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-28 06:28:14 +00:00
Alex Moreno	0a8dbe8e4d	Revert "feat: fixes #7196" ... This reverts commit e8e6a88066.	2024-06-28 08:23:11 +02:00
William Buezas	db4c3a6799	Changes	2024-06-27 11:46:31 -03:00
Jorge Penadés	e8c349a550	Merge branch 'dev' into 7436-showQCheckbox	2024-06-27 12:54:35 +00:00
Jorge Penadés	e610013038	Merge branch 'dev' into 7433-fixSkeleton	2024-06-27 12:53:57 +00:00
Alex Moreno	381a9c6d1d	feat: remake vnInputDate and fix: FormModel has changes when error	2024-06-27 13:56:20 +02:00
Jorge Penadés	7c16137908	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton	2024-06-27 13:40:49 +02:00
Alex Moreno	f78ae08550	fix: cypress.config to mjs	2024-06-27 13:39:27 +02:00
Jorge Penadés	e7ad147d04	fix: refs #7433 skeleton	2024-06-27 13:16:42 +02:00
Jon Elias	56e63852ed	Merge pull request '#6464 correct negativeBases' (!373) from 6464-fixNegativeBases into dev ... Reviewed-on: #373 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-27 10:30:19 +00:00
Jorge Penadés	6d71aef9e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox	2024-06-27 12:27:35 +02:00
Jorge Penadés	ed642b299e	feat: refs #7436 show checkbox	2024-06-27 12:27:04 +02:00
Jon Elias	95f70ba765	Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-27 10:15:18 +02:00
Jon Elias	fd744158ac	fix: refs 6464 deleted useless class in checkbox	2024-06-27 10:15:17 +02:00
Jon Elias	f6e0cb41ce	Merge branch 'dev' into 6464-fixNegativeBases	2024-06-27 07:36:02 +00:00
Javi Gallego	01e44753e4	Merge pull request 'feat: fixes #7196' (!463) from 7196-cjsToEsm into dev ... Reviewed-on: #463 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-27 06:22:34 +00:00
Javi Gallego	a8c3f1d9e5	Merge branch 'dev' into 7196-cjsToEsm	2024-06-27 06:20:03 +00:00
William Buezas	5b07f3015d	small change	2024-06-26 17:02:21 -03:00
Jon Elias	6bf2a8c2f6	Merge branch 'dev' into 7543-StandarizeDescriptors	2024-06-26 12:29:18 +00:00
Jon Elias	452d1000bc	refactor: refs #7543 requested changes	2024-06-26 14:28:21 +02:00
Jorge Penadés	152bd5ff08	Merge pull request '#7623 add updateRoute prop in VnPaginate' (!475) from 7623-fix-redirection into dev ... Reviewed-on: #475 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-26 12:21:59 +00:00
Jorge Penadés	92f9869a36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-26 14:18:57 +02:00
William Buezas	fd03336c7a	Resolve conflicts	2024-06-26 09:12:23 -03:00
William Buezas	ae73dd047f	changes	2024-06-26 08:55:30 -03:00
William Buezas	8ee4fa2e7d	Resolve conflicts	2024-06-26 08:39:56 -03:00
William Buezas	cd01ba8fe1	changes	2024-06-26 08:36:17 -03:00
Carlos Satorres	44ba965feb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-26 11:42:38 +02:00
Carlos Satorres	efa8791b9d	refs #6898 remove comment	2024-06-26 11:40:59 +02:00
Carlos Satorres	98b125281c	Merge pull request '7409-workerBalance' (!451) from 7409-workerBalance into dev ... Reviewed-on: #451 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-26 09:40:36 +00:00
Carlos Satorres	c570f2058b	Merge branch 'dev' into 7409-workerBalance	2024-06-26 09:37:52 +00:00
Carlos Satorres	def8d4222b	refs #6898 fix warnings	2024-06-26 11:33:02 +02:00
Carlos Satorres	1f41f8e564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-26 10:10:00 +02:00
Carlos Satorres	6f2573880c	refs #7409 fix balance and formation	2024-06-26 09:59:37 +02:00
Jorge Penadés	752f3ace58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-26 09:38:37 +02:00
Jon Elias	de2c3cc244	fix: refs #6826 fix roleDescriptor	2024-06-26 08:56:17 +02:00
Jon Elias	677e71d1a7	refactor: refs #7543 standarized descriptors	2024-06-26 08:26:04 +02:00