5485 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	6378be5933	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-14 15:26:49 +02:00
Javier Segarra	c878fc9cff	feat: remove duplicity	2024-08-14 15:26:47 +02:00
Jon Elias	95cda2bad7	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 13:10:25 +00:00
Jon Elias	ea43df81fd	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-14 15:09:30 +02:00
Jon Elias	d12fcd3b34	refactor: refs #7354 refactor deliveryPanel	2024-08-14 15:09:28 +02:00
Jorge Penadés	3bba5db1b5	fix: refs #6900 improve logic	2024-08-14 14:52:47 +02:00
Jorge Penadés	65d893e128	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:30:47 +02:00
Jorge Penadés	760dc0e6f4	Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:27:57 +02:00
Jorge Penadés	6dd9029871	fix: refs #6900 improve logic	2024-08-14 14:27:54 +02:00
Alex Moreno	895441a8e4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-14 13:40:25 +02:00
Alex Moreno	c7f53635d9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-08-14 13:40:13 +02:00
Alex Moreno	a8f550fcc8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-14 13:39:54 +02:00
Jorge Penadés	e07d573788	Merge branch 'test' into 6900-addSerial	2024-08-14 10:13:39 +00:00
Jorge Penadés	7a27b9808f	Merge pull request '#7323 warmfix' (!621) from 7323-warmfix-fixErrors into test ... Reviewed-on: #621 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 09:02:27 +00:00
Jon Elias	926fba27b8	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 08:45:37 +00:00
Jon Elias	ed4bf3cfa8	refactor: refs #7354 requested changes	2024-08-14 10:44:45 +02:00
Jorge Penadés	9bb67511e6	fix: refs #7323 vnsubtoolbar css	2024-08-14 10:34:42 +02:00
Jorge Penadés	d7eb3af48d	fix: refs #7323 add locale	2024-08-14 10:10:22 +02:00
Jorge Penadés	32fdec2fae	feat: refs #7323 improve test	2024-08-14 10:08:31 +02:00
Jorge Penadés	30cadb5697	fix: refs #7323 use workerFilter	2024-08-14 09:11:14 +02:00
Jon Elias	71068d3e62	Merge pull request 'Hotfix: InvoiceOut List and NegativeBases' (!615) from hotfix_InvoiceOut_List&NegativeBases into master ... Reviewed-on: #615 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 06:56:39 +00:00
Alex Moreno	07e4dca361	refactor(invoiceOutList): create dialog	2024-08-14 08:55:18 +02:00
Pablo Natek	ffd7d98e9c	feat: travel m3	2024-08-13 17:56:07 +02:00
Jorge Penadés	e7def05d40	feat: refs #7323 add flex-wrap	2024-08-13 16:59:43 +02:00
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