5514 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	e780dcda05	fix: refs #7323 load all opts	2024-08-13 16:45:30 +02:00
Alex Moreno	e9873a43b1	Merge pull request '7848-recoveryPassword' (!617) from 7848-recoveryPassword into dev ... Reviewed-on: #617 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-13 14:43:46 +00:00
Alex Moreno	0a0e8be39f	Merge branch 'dev' into 7848-recoveryPassword	2024-08-13 14:41:23 +00:00
Alex Moreno	3cbdf25410	delete name default	2024-08-13 16:40:02 +02:00
Alex Moreno	fdb508de97	delete cy.logs	2024-08-13 16:31:34 +02:00
Carlos Satorres	b5537d6ae5	Merge pull request '7355-accountMigration2' (!619) from 7355-accountMigration2 into dev ... Reviewed-on: #619 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-13 13:10:39 +00:00
Jon Elias	0e9739f2a5	refactor: refs #7354 refactor zones section and fixed e2e tests	2024-08-13 14:39:50 +02:00
Carlos Satorres	c6db81ddb5	Merge pull request '#7323 use global locale' (!618) from 7323-warmfix-i18nTag into test ... Reviewed-on: #618 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-13 11:20:15 +00:00
Carlos Satorres	405092f66d	fix: account subsections cards	2024-08-13 13:11:23 +02:00
Carlos Satorres	aae881c24a	fix(account_card): redirection	2024-08-13 12:59:22 +02:00
Jorge Penadés	a24caa9393	fix: refs #7323 use global locale	2024-08-13 12:56:39 +02:00
Carlos Satorres	e144f0be01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2	2024-08-13 12:52:14 +02:00
Alex Moreno	e88e7fa9db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-13 12:25:47 +02:00
Alex Moreno	b828fd35b7	test: add two factor e2e	2024-08-13 12:25:46 +02:00
Alex Moreno	dc1accff7a	test: add recover and reset password e2e	2024-08-13 12:25:37 +02:00
Alex Moreno	a46198e2d0	feat: add recover password and reset password	2024-08-13 12:25:08 +02:00
Jorge Penadés	e0473b589c	Merge pull request 'test to dev' (!616) from test into dev ... Reviewed-on: #616 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-13 09:29:29 +00:00
Jorge Penadés	ac7c939e98	Merge pull request '#7323 add my account btn & fix models log selectable' (!614) from 7323-fixWorkerLog into test ... Reviewed-on: #614 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-13 09:20:49 +00:00
Jon Elias	4401a6108f	Merge branch 'master' into hotfix_InvoiceOut_List&NegativeBases	2024-08-13 09:19:46 +00:00
Jon Elias	de7251e16d	fix: InvoiceOut List and negative bases	2024-08-13 11:18:07 +02:00
Jorge Penadés	d276436bb3	chore: refs #7323 fix test	2024-08-13 10:42:15 +02:00
Jorge Penadés	81c70c9511	chore: refs #7323 remove unused import	2024-08-13 10:06:58 +02:00
Jorge Penadés	e428da4a29	feat: refs #7323 add my account" btn & fix models log selectable	2024-08-13 10:05:07 +02:00
Alex Moreno	ecfe933039	Merge pull request '7863-devToTest_2434' (!613) from 7863-devToTest_2434 into test ... Reviewed-on: #613 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-13 06:58:12 +00:00
Alex Moreno	d27821c100	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-13 08:37:15 +02:00
Jorge Penadés	de24a3efdb	feat: refs #6900 add locale	2024-08-12 15:34:09 +02:00
Jon Elias	aefcfdba51	fix: refs #7354 fix zoneSearchbar	2024-08-12 14:28:35 +02:00
Jorge Penadés	c7679fd142	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-12 14:22:47 +02:00
Jorge Penadés	59262019f8	Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev ... Reviewed-on: #588 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 12:08:45 +00:00
Jon Elias	0f8e5b8bf0	Merge pull request 'Hotfix: new field's order in warehouse filter' (!611) from hotfix_TicketList_WarehouseFilter into master ... Reviewed-on: #611 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-12 12:06:33 +00:00
Jon Elias	563ab2de9c	Merge branch 'master' into hotfix_TicketList_WarehouseFilter	2024-08-12 12:05:51 +00:00
Jorge Penadés	c4de1beabf	feat: refs #6900 add InvoiceInSerial	2024-08-12 13:46:56 +02:00
Jon Elias	72c8379b20	fix: new field's order in warehouse filter	2024-08-12 13:18:31 +02:00
Jon Elias	b955ded123	fix: refs #7354 fix list searchbar and filters	2024-08-12 12:58:19 +02:00
Jorge Penadés	2cf669b479	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 10:51:40 +00:00
Carlos Satorres	94878b700b	refs #7355 account cards loads	2024-08-12 12:39:06 +02:00
Alex Moreno	3222a7a42c	fix(orderLines): reload when delete and redirect when confirm	2024-08-12 11:51:21 +02:00
Alex Moreno	1e4a309a84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-12 11:47:01 +02:00
Alex Moreno	65a80e006b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-12 11:46:09 +02:00
Alex Moreno	1e78bc293e	Merge pull request 'fix(customerDescription): fix action buttons' (!608) from hotFix_customerDescription_actions into master ... Reviewed-on: #608 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-12 09:45:07 +00:00
Jorge Penadés	9708214462	chore: refs #7283 drop array types	2024-08-12 11:01:32 +02:00
Jorge Penadés	239e796d2e	chore: refs #7283 update VnAvatar title handling	2024-08-12 11:00:03 +02:00
Jon Elias	9387082fc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-12 10:35:55 +02:00
Jon Elias	41afc52f65	fix events and descriptor menu	2024-08-12 10:33:40 +02:00
Alex Moreno	190579e7fd	fix: orderCatalogFilter order	2024-08-12 10:22:52 +02:00
Jorge Penadés	f5ffe2a07b	refactor: refs #7283 update avatar size and color	2024-08-12 10:18:14 +02:00
Alex Moreno	e11e51f432	fix: order description to vnTable	2024-08-12 09:17:51 +02:00
Jon Elias	2189244730	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-12 08:38:54 +02:00
Alex Moreno	5e88004e79	fix(customerDescription): fix action buttons	2024-08-12 08:34:16 +02:00
Jorge Penadés	6b80c52b71	chore: refs #7283 drop import	2024-08-09 15:42:31 +02:00