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 30 MiB
Commit Graph

7629 Commits

Author SHA1 Message Date
Jon Elias d4682248fd Merge branch 'Fix-Items-Module' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-Items-Module 2024-12-09 13:24:36 +01:00
Jon Elias 1de74dec8e fix: fix conflicts 2024-12-09 13:24:34 +01:00
Jon Elias bf68eab480 Merge pull request '#8194 created VnSelectWorker component' (!977) from 8194-VnSelectWorker into dev 
Reviewed-on: verdnatura/salix-front#977
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-09 12:04:18 +00:00
Jon Elias 853bb9e5aa Merge branch 'dev' into 8194-VnSelectWorker 2024-12-09 12:02:16 +00:00
Jon Elias e4837b45be Merge branch 'dev' into Fix-Items-Module 2024-12-09 12:01:07 +00:00
Jorge Penadés 9342cd0408 Merge pull request 'Mixin performance' (!875) from performance_mixins into dev 
Reviewed-on: verdnatura/salix-front#875
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 11:38:51 +00:00
Jorge Penadés f16c45b01a Merge branch 'dev' into performance_mixins 2024-12-09 11:37:52 +00:00
Jon Elias 92b05db9d2 refactor: deleted useless hidden tag 2024-12-09 11:27:30 +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
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
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
Jon Elias 646007ea63 refactor: log error 2024-12-05 10:30:43 +01: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 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
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
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 a6a21f3925 Merge pull request 'remove autocomplete address' (!935) from 8114-removeAutoAddress into dev 
Reviewed-on: verdnatura/salix-front#935
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-04 09:43:24 +00:00
Carlos Satorres fc3c80d60d fix: refs #8114 fix lifeCycle hooks 2024-12-04 10:35:33 +01:00
Carlos Satorres e55d116398 fix: refs #8114 fix pr 2024-12-04 10:31:59 +01:00
Carlos Satorres 41292e467b Merge branch '8114-removeAutoAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress 2024-12-04 09:27:24 +01:00
Carlos Satorres 55627a5b47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress 2024-12-04 09:24:35 +01:00
Carlos Satorres 29b923130f Merge branch 'dev' into 8114-removeAutoAddress 2024-12-04 08:22:58 +00: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
Jon Elias 4276cefd7a feat: requested changes in item module 2024-12-04 09:14:00 +01:00