wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
1,847 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

1847 Commits

Author SHA1 Message Date
Jorge Penadés 3a1ba0bc17 fix: refs #6315 drop icon prop 2024-02-29 15:35:58 +01:00
Jorge Penadés a5463c4738 Merge branch '6317-createVnCurrency' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-29 15:22:43 +01:00
Jorge Penadés cbf9bff0e3 fix: refs #6315 drop icon 2024-02-29 15:22:41 +01:00
Jorge Penadés 151d08f0bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-29 14:53:01 +01:00
Carlos Satorres b554577e6f Merge pull request 'refs #6933 fetchedTags title fix' (!216) from 6933-fetchedTagsRefact into dev 
Reviewed-on: verdnatura/salix-front#216
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-29 11:05:03 +00:00
Alex Moreno 9119865ed6 Merge branch 'dev' into 6933-fetchedTagsRefact 2024-02-29 11:02:49 +00:00
Alex Moreno 097d3e5020 Merge pull request 'refs #6797 deploy: use pnpm' (!206) from 6797-use-pnpm into dev 
Reviewed-on: verdnatura/salix-front#206
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-02-29 11:01:11 +00:00
Alex Moreno 3c72acda37 Merge branch 'dev' into 6797-use-pnpm 2024-02-29 09:26:08 +00:00
Alex Moreno 742b87c78e refs #6956 deploy: init version 2412 2024-02-29 10:24:50 +01:00
Alex Moreno ada7dc2cb2 Merge pull request '#6945 Quit VnRow' (!215) from 6945-quitVnRow into dev 
Reviewed-on: verdnatura/salix-front#215
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-29 09:22:47 +00:00
Carlos Satorres 3804ec3e36 refs #6933 fetchedTags title fix 2024-02-29 09:22:44 +01:00
Alex Moreno 138e62a5e1 Merge branch 'dev' into 6797-use-pnpm 2024-02-29 07:25:56 +00:00
Jorge Penadés 2969191657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6945-quitVnRow 2024-02-28 15:22:30 +01:00
Jorge Penadés 26184328f9 fix: refs #6945 entryNotes 2024-02-28 15:21:44 +01:00
Jorge Penadés b1d8ce40bc fix: refs #6945 css vnRow 2024-02-28 15:13:43 +01:00
Carlos Satorres 98c3ac51dc Merge pull request 'refs #6768 - VnLocationRefact' (!200) from 6768-VnLocationRefact into dev 
Reviewed-on: verdnatura/salix-front#200
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-28 13:10:27 +00:00
Carlos Satorres 447cbdeca8 Merge branch 'dev' into 6768-VnLocationRefact 2024-02-28 13:09:17 +00:00
Carlos Satorres dd8ec1309f refs #6768 fix order 2024-02-28 10:59:12 +01:00
Carlos Satorres b8c6f43d0c refs #6768 shelving fix 2024-02-28 10:58:41 +01:00
Carlos Satorres 32685efc1c Merge branch '6768-VnLocationRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6768-VnLocationRefact 2024-02-28 10:28:13 +01:00
Carlos Satorres 65fcfbff91 refs #6768 summary redirect 2024-02-28 10:28:11 +01:00
Jorge Penadés 4d84513979 Merge pull request '#6909 add warning unsaved changes' (!211) from 6909-addWarningUnsavedChanges into dev 
Reviewed-on: verdnatura/salix-front#211
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-02-28 07:40:19 +00:00
Alex Moreno a810209c9a Merge branch 'dev' into 6797-use-pnpm 2024-02-28 07:38:50 +00:00
Alex Moreno ced041ad43 refs #6797 package: fix pnpm-lock 2024-02-28 08:37:57 +01:00
Jorge Penadés 96077f3174 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6909-addWarningUnsavedChanges 2024-02-28 08:34:19 +01:00
Carlos Satorres 63d17466ea Merge pull request 'refs #6908 remove Banner' (!213) from 6908-removeSMSBanner into dev 
Reviewed-on: verdnatura/salix-front#213
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-28 07:33:37 +00:00
Alex Moreno f4d32e09eb Merge branch '6797-use-pnpm' of https://gitea.verdnatura.es/verdnatura/salix-front into 6797-use-pnpm 2024-02-28 08:30:44 +01:00
Alex Moreno 547b5e4a76 refs #6797 package: old vitest version 2024-02-28 08:30:42 +01:00
Alex Moreno 22db239ed8 Merge branch 'dev' into 6797-use-pnpm 2024-02-28 07:28:53 +00:00
Jorge Penadés ddff5a3661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6909-addWarningUnsavedChanges 2024-02-27 15:41:48 +01:00
Jorge Penadés 1484b7de3b feat: refs #6909 popup onBeforeLeave 2024-02-27 15:41:09 +01:00
Carlos Satorres b69b937c42 refs #6908 remove Banner 2024-02-27 14:27:09 +01:00
Alex Moreno 65d03222ed Merge pull request 'refs #5509 - entryDms' (!199) from 5509-entryDms into dev 
Reviewed-on: verdnatura/salix-front#199
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-02-27 11:33:44 +00:00
Javier Segarra dd70a28c98 Merge branch 'dev' into 5509-entryDms 2024-02-27 10:45:32 +00:00
Pablo Natek af779f0fc2 Merge pull request 'refs #6797 warmFix: jenkinsfile' (!210) from warmFix_jenkins_junitresult into dev 
Reviewed-on: verdnatura/salix-front#210
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-02-27 08:45:43 +00:00
Alex Moreno 504ea7b5fb refs #6797 warmFix: jenkinsfile 2024-02-27 09:39:19 +01:00
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-27 08:23:02 +01:00
Alex Moreno c8a4854df9 refs #5509 fix(vnDms): fix issues 2024-02-27 08:22:38 +01:00
Jorge Penadés a1a342a107 Merge pull request '#6904 fix customer section' (!204) from 6904-fixCustomerSection into dev 
Reviewed-on: verdnatura/salix-front#204
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-02-26 14:24:05 +00:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
Jorge Penadés f90c3d7474 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6904-fixCustomerSection 2024-02-26 14:23:46 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList 2024-02-26 14:17:02 +01:00
Alex Moreno 6dd227769f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-26 12:43:45 +01:00
Alex Moreno fa80586fdd refs #6797 deploy: use pnpm 2024-02-26 12:33:06 +01:00
Alex Moreno 5ac5f91847 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-26 10:03:17 +01:00
Alex Moreno 99bb04bb0f Merge pull request 'refs #6336 hotFix(claimSummary): loadPhoto, ItemDescriptor' (!205) from 6336-hotFix-claimSummary into master 
Reviewed-on: verdnatura/salix-front#205
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-02-26 08:50:37 +00:00
Javier Segarra 8493e18f2b Merge pull request '#6935 - Update CardDescriptor Style' (!203) from 6935_update_CardDescriptorStyle into dev 
Reviewed-on: verdnatura/salix-front#203
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-02-26 08:29:33 +00:00
Alex Moreno d3d73b985e refs #6336 fix(claimSummary): loadPhoto, ItemDescriptor 2024-02-26 09:16:37 +01:00
Javier Segarra e859fc29c8 refs #6935 feat: remove width, add text-align and label : 2024-02-26 08:33:17 +01:00
Carlos Satorres 6512cee257 Merge branch 'dev' into 6768-VnLocationRefact 2024-02-23 12:33:15 +00:00