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

7818 Commits

Author SHA1 Message Date
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
Carlos Satorres d9fe5be6fe Merge branch 'dev' into 7031-zonePrice 2024-12-09 08:11:53 +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
Jon Elias b26d07f605 Merge branch 'Fix-Items-Module' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-Items-Module 2024-12-09 08:49:27 +01:00
Jon Elias f5f77a50bc refactor: added again search emit 2024-12-09 08:49:26 +01:00
Javier Segarra edef54dae1 Merge branch 'master' into hotfix_scrollToItem 2024-12-09 07:45:18 +00:00
Jon Elias 338058c1a4 Merge branch 'dev' into Fix-Items-Module 2024-12-09 07:22:17 +00:00
Jon Elias 0c88db5931 refactor: deleted onUnmounted code 2024-12-09 08:20:35 +01: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
Carlos Satorres dc4ae1fd92 Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-12-09 06:57:47 +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
Jon Elias fea161d5c2 perf: refs #8194 select worker component 2024-12-05 14:19:58 +01:00
Jon Elias 96920dd540 refactor: refs #8194 modified select worker template 2024-12-05 14:13:31 +01:00
Jon Elias cf522684d6 refactor: refs #8194 deleted unnecessary label 2024-12-05 14:00:45 +01:00
Jon Elias 6c05347219 refactor: refs #8194 modified select worker to allow no one filter from monitor ticket 2024-12-05 13:45:18 +01:00
Jon Elias accf61517a refactor: refs #8194 requested changes 2024-12-05 13:31:39 +01:00
Jon Elias c7115f4781 refactor: refs #8194 moved translation to the correct place 2024-12-05 11:14:15 +01:00
Jon Elias 2d2187090c Merge branch 'dev' of https: refs #8194//gitea.verdnatura.es/verdnatura/salix-front into 8194-VnSelectWorker 2024-12-05 11:04:02 +01:00
Jon Elias 1e1032b3da refactor: refs #8194 structure changes in component and related files 2024-12-05 11:00:40 +01:00
Javier Segarra b068515f55 perf: test command fillInForm 2024-12-05 09:43:45 +00:00
Jon Elias 646007ea63 refactor: log error 2024-12-05 10:30:43 +01: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 dcbaa7529d Merge branch 'test' into dev 2024-12-05 09:24:45 +01:00
Guillermo Bonet 407b81f4b7 Merge branch 'master' into test 2024-12-05 09:24:35 +01:00
Carlos Satorres 47f81f2b2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-12-05 09:19:55 +01:00
Carlos Satorres 3d0245553e Merge pull request 'fix-7355AccountCreate' (!1051) from fix-7355AccountCreate into dev 
Reviewed-on: verdnatura/salix-front#1051
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-05 08:17:23 +00:00
Carlos Satorres c3c10b2238 fix: account create 2024-12-05 09:03:13 +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
Carlos Satorres 91c9a4a559 Merge branch 'dev' into 7031-zonePrice 2024-12-05 07:32:10 +00:00
Carlos Satorres cb15652dd6 fix: refs #7031 add test e2e 2024-12-05 08:28:43 +01:00
Jon Elias 58a18bfb69 refactor: deleted warnings and corrected itemTag 2024-12-05 06:26:02 +01:00
Carlos Satorres 95551d9f99 fix: account 2024-12-05 06:03:10 +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
Carlos Satorres f5c6810d9e fix: accountList create 2024-12-04 13:58:59 +01:00
Jorge Penadés e0090c29c9 Merge branch 'dev' into performance_mixins 2024-12-04 12:22:09 +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