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

2281 Commits

Author SHA1 Message Date
Alex Moreno 138e62a5e1 Merge branch 'dev' into 6797-use-pnpm 2024-02-29 07:25:56 +00:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module 
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
 2024-02-28 21:27:01 -03:00
Kevin Martinez e93864e967 Update routes list input 2024-02-28 21:21:07 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03: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
William Buezas fe5e448cf0 Change show summary icon condition 2024-02-28 10:13:49 -03: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
William Buezas 9e86036f40 Change new address tooltip 2024-02-28 09:53:15 -03:00
Javier Segarra 6e9a491e50 Merge branch '6930_scopedToken_Multimedia' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia 2024-02-28 13:16:02 +01:00
Javier Segarra 39381f29d7 refs #6980 test: fix failed tests 2024-02-28 13:15:59 +01:00
William Buezas f1961f07d1 CardSummary changes 2024-02-28 08:54:53 -03:00
William Buezas 98c92abba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-02-28 08:29:39 -03:00
Javier Segarra fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-02-28 10:58:22 +00:00
Javier Segarra e708e0cd6d refs #6980 feat: enable List, disable summary 2024-02-28 11:52:36 +01:00
Javier Segarra 0d80fd37a4 refs #6930 feat: call loutMultimedia endpoint 2024-02-28 11:28:57 +01: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
Pablo Natek fbd303f1f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-02-28 10:08:19 +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
Javier Segarra bddfe8f9d7 refs #6930 feat: call shareToken endpoint 2024-02-28 08:33:26 +01: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
Alex Moreno 5645336040 refs #6795 hotFix(claimSummary) fix ItemDescriptorProxy 2024-02-28 07:55:11 +01:00
Javier Segarra 02934037e7 refs #6940 fix: show button in Navbar 2024-02-28 06:38:59 +01:00
Javier Segarra d863248177 refs #6940 fix: use onMounted 2024-02-28 06:38:25 +01:00
William Buezas 5c8b3da33d Merge conflicts 2024-02-27 13:24:21 -03:00
William Buezas e7e34ef21a Hide Go to summary icon when is in supplier summary view 2024-02-27 13:03:31 -03:00
Kevin Martinez 4be9c02711 Fix routes add ticket dialog 2024-02-27 12:41:42 -03: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
Kevin Martinez 3c68f4779f Fix roadmap add stop dialog label 2024-02-27 10:35:56 -03:00
Carlos Satorres b69b937c42 refs #6908 remove Banner 2024-02-27 14:27:09 +01:00
Carlos Satorres 478f0e17b1 refs #6890 change redirect 2024-02-27 14:19:53 +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
William Buezas 59dc1a4e38 Entry summary icon redirection condition 2024-02-27 08:17:55 -03:00
Javier Segarra dd70a28c98 Merge branch 'dev' into 5509-entryDms 2024-02-27 10:45:32 +00:00
William Buezas 50218d6ddf WIP 2024-02-27 07:32:51 -03: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