wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,629 Commits 155 Branches 0 Tags 29 MiB
Commit Graph

7629 Commits

Author SHA1 Message Date
Alex Moreno 051482fd23 Merge pull request '8282-testToMaster' (!1057) from 8282-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1057
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-12-10 06:23:35 +00:00
Alex Moreno ff8561d0c2 chore: refs #8282 add changelog 2024-12-09 15:24:18 +01:00
Alex Moreno cd4b2a92dc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-09 14:17:41 +01:00
Jorge Penadés 1a954459eb Merge pull request 'feat: refs #7409 add dialog with validations' (!1056) from 7409-hotfix-addValidations into master 
Reviewed-on: verdnatura/salix-front#1056
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 10:01:18 +00:00
Jorge Penadés a4fb2a4819 feat: refs #7409 add dialog with validations 2024-12-09 10:39:51 +01:00
Jorge Penadés fe037ce511 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-hotfix-addValidations 2024-12-09 09:55:48 +01:00
Jorge Penadés f1cc4a01ad feat: refs #7409 add dialog with validations 2024-12-09 09:55:06 +01:00
Javier Segarra ce72388d5e Merge pull request 'HOTFIX: OrderCatalog scroll To Item' (!1026) from hotfix_scrollToItem into master 
Reviewed-on: verdnatura/salix-front#1026
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-09 08:44:07 +00:00
Javier Segarra f049337f95 Merge branch 'master' into hotfix_scrollToItem 2024-12-09 08:42:47 +00:00
Javier Segarra 2e4225f0a9 Merge pull request 'HOTFIX: open Itemdiary from Ticket' (!1054) from hotfix_itemDiary_redirect into master 
Reviewed-on: verdnatura/salix-front#1054
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 08:42:32 +00:00
Javier Segarra fb7f982356 Merge pull request 'warmFix: fix own test' (!1041) from fix_js_e2e_test into test 
Reviewed-on: verdnatura/salix-front#1041
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 08:42:21 +00:00
Javier Segarra dc294c78fc Merge branch 'master' into hotfix_itemDiary_redirect 2024-12-09 07:53:52 +00:00
Javier Segarra 4eb491d793 perf: i18n missing 2024-12-09 08:53:23 +01:00
Javier Segarra 933a1958a2 perf: remove unnecessary logic 2024-12-09 08:51:26 +01:00
Javier Segarra edef54dae1 Merge branch 'master' into hotfix_scrollToItem 2024-12-09 07:45:18 +00:00
Javier Segarra 69e3d3159f Merge pull request 'ItemFixedPrice' (!791) from hotfix_itemFixedPrice into master 
Reviewed-on: verdnatura/salix-front#791
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-09 07:05:53 +00:00
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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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 32a17738eb Merge pull request 'fix: fix invoiceOut filter' (!1038) from hotfix-6899invoiceOut into master 
Reviewed-on: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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