7720 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	e0bc14e3f7	Merge branch 'master' into hotfix_itemFixedPrice	2024-12-09 07:05:18 +00:00
Alex Moreno	8a1812dbb0	Merge pull request 'fix(TicketSaleMoreActions): hotFix isClaimable' (!1055) from hotFix_ticketSale_isClaimable into master ... Reviewed-on: #1055 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-12-09 07:00:59 +00:00
Alex Moreno	88863a215a	fix(TicketSaleMoreActions): hotFix isClaimable	2024-12-09 07:56:50 +01:00
Javier Segarra	96223801d2	fix: open Itemdiary from Ticket	2024-12-06 14:59:47 +01:00
Javier Segarra	11ef388f92	Merge branch 'fix_js_e2e_test' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_js_e2e_test	2024-12-05 14:55:56 +01:00
Javier Segarra	4c01cf9603	perf: remove timeout	2024-12-05 14:55:51 +01:00
Javier Segarra	b068515f55	perf: test command fillInForm	2024-12-05 09:43:45 +00:00
Javier Segarra	408aa9d535	test: pref minor change	2024-12-05 10:20:35 +01:00
Javier Segarra	d02acf4d90	Merge branch 'test' into fix_js_e2e_test	2024-12-05 08:52:54 +00:00
Guillermo Bonet	407b81f4b7	Merge branch 'master' into test	2024-12-05 09:24:35 +01:00
Guillermo Bonet	ebf5b74660	Merge pull request 'feat: refs #8248 Added beta in jenkinsfile' (!1050) from 8248-addBetaJenskinsfile into beta ... Reviewed-on: #1050 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-05 07:55:41 +00:00
Guillermo Bonet	b6844a517f	feat: refs #8248 Added beta in jenkinsfile	2024-12-05 08:50:06 +01:00
Javier Segarra	0198a25972	Merge pull request 'fix: use right variable instead item.name' (!1048) from hotfix_ticketSale_concept into master ... Reviewed-on: #1048 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 14:06:21 +00:00
Javier Segarra	ad176f3f95	fix: use right variable instead item.name	2024-12-04 13:45:12 +00:00
Jorge Penadés	559ee5416a	Merge pull request 'fix: refs #6238 enhance ui' (!1047) from 6238-hotfix-wideCol into master ... Reviewed-on: #1047 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 11:33:19 +00:00
Jorge Penadés	dc801489b3	Merge branch 'master' into 6238-hotfix-wideCol	2024-12-04 11:26:48 +00:00
Jorge Penadés	26b6157f65	fix: refs #6238 drop important	2024-12-04 12:18:31 +01:00
Javier Segarra	228c6e50f2	Merge pull request 'HOTFIX: vnLocation change value' (!1046) from hotfix_vnLocation_change_value into master ... Reviewed-on: #1046 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 11:14:04 +00:00
Jorge Penadés	a661f938b7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-hotfix-wideCol	2024-12-04 12:13:46 +01:00
Jorge Penadés	4c9b8a339e	fix: refs #6238 enhance ui	2024-12-04 12:12:01 +01:00
Javier Segarra	17751323b3	fix: vnLocation change value	2024-12-04 10:53:46 +00:00
Alex Moreno	6b28f39720	fix(CustomerWebAccess): hotFix use .account to save	2024-12-04 11:32:19 +01:00
Carlos Satorres	809ad95e46	fix: hotfix date	2024-12-04 10:18:05 +01:00
Alex Moreno	242f6b23d8	Merge branch '8197-VnCardMain' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain	2024-12-04 09:49:51 +01:00
Alex Moreno	2d2501838b	revert: refs #8197 arrayData changes	2024-12-04 09:49:48 +01:00
Alex Moreno	0c4d6c782e	Merge branch 'master' into 8197-VnCardMain	2024-12-04 08:45:11 +00:00
Alex Moreno	1b2af7cb84	chore: refs #8197 remove console log	2024-12-04 09:44:21 +01:00
Alex Moreno	68fc565324	feat(VnPaginate): refs #8197 hold data when change to Card	2024-12-04 09:44:09 +01:00
Carlos Satorres	32a17738eb	Merge pull request 'fix: fix invoiceOut filter' (!1038) from hotfix-6899invoiceOut into master ... Reviewed-on: #1038 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 08:21:58 +00:00
Carlos Satorres	0da4591da8	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:20:14 +00:00
Javier Segarra	98b8124577	perf: remove setTimeOut insteaduse requestAnimationFrame	2024-12-04 09:15:02 +01:00
Javier Segarra	b1f42cc7e0	test: fix own test	2024-12-03 15:35:24 +01:00
Javier Segarra	dcbb0da8c0	Merge branch 'master' into hotfix_scrollToItem	2024-12-03 14:33:17 +00:00
Javier Segarra	7b39fc5f83	Merge branch 'master' into hotfix_itemFixedPrice	2024-12-03 14:32:14 +00:00
Jorge Penadés	7c71becb64	Merge pull request 'feat: add country filter & fix userParams' (!1040) from hotfix-addCountryFilter into master ... Reviewed-on: #1040 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 14:18:26 +00:00
Jorge Penadés	94c0177f1b	feat: mock validations	2024-12-03 14:37:45 +01:00
Alex Moreno	e35fe20a10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-12-03 14:32:21 +01:00
Alex Moreno	f045b37b55	Merge pull request '8267-devToTest' (!1036) from 8267-devToTest into test ... Reviewed-on: #1036 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-12-03 13:32:09 +00:00
Jorge Penadés	4b1a4adfe3	feat: add country filter & fix userParams	2024-12-03 14:01:17 +01:00
Alex Moreno	b698098823	fix: hotfix correct path "log"	2024-12-03 11:03:40 +01:00
Carlos Satorres	2afaa48c25	fix: fix invoiceOut filter	2024-12-03 10:25:33 +01:00
Carlos Satorres	d832d958ef	Merge pull request 'fix: due date' (!1037) from hotfix-6896OrderTranslat into master ... Reviewed-on: #1037 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-03 08:37:21 +00:00
Carlos Satorres	b536cfe0af	fix: due date	2024-12-03 09:35:19 +01:00
Alex Moreno	ad3894e6b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest	2024-12-03 08:37:05 +01:00
Alex Moreno	a36287d8fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest	2024-12-03 08:31:18 +01:00
Alex Moreno	4bc8c948b6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-12-03 08:29:40 +01:00
Javier Segarra	9ac974a46b	Merge branch 'master' into hotfix_itemFixedPrice	2024-12-02 23:03:38 +01:00
Javier Segarra	0ddc8f225c	test: #7260 add dataCy	2024-12-02 23:02:35 +01:00
Javier Segarra	4f93d472ac	fix: #7260 remove value	2024-12-02 23:02:13 +01:00
Jorge Penadés	4d6ee25aeb	Merge pull request 'fix: refs #6818 get default prefix on err' (!1034) from 6818-hotfix-getDefaultPrefix into master ... Reviewed-on: #1034 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-02 15:08:04 +00:00