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

3532 Commits

Author SHA1 Message Date
Pablo Natek 3abcf7bb09 Merge branch 'dev' into 6349-removeRma 2024-03-01 07:38:22 +00:00
Jorge Penadés 85b8d5d8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-01 08:37:03 +01:00
Carlos Satorres 0de5ad0648 refs #6892 refact summary 2024-03-01 08:36:04 +01:00
carlosfonseca f8b698e4e7 Solucion a comentarios 28 2024-02-29 13:32:28 -05:00
Jorge Penadés c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-02-29 15:52:43 +01:00
Jorge Penadés 8523256faf fix: refs #6315 remove test patch 2024-02-29 15:51:18 +01:00
Jorge Penadés 4b68f5224f fix: refs #6315 drop icon prop 2024-02-29 15:45:07 +01:00
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
Kevin Martinez b2be4c1380 Fix routes list spaces 2024-02-29 11:01:41 -03: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
carlosfonseca 663010a0d4 Solucion a comentarios 27 2024-02-29 07:08:34 -05:00
Kevin Martinez a35eb1e2f2 Update routes list no result label 2024-02-29 08:08:00 -03: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
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 49cd90d9ff resolve customer extended list conflicts 2024-02-28 13:03:27 -03:00
William Buezas a0f9c811ff resolve conflicts 2024-02-28 12:56:13 -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
carlosfonseca 93015d9f98 Solucion a comentarios 26 2024-02-28 08:28:46 -05: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
carlosfonseca e56aa6587f Solucion a comentarios 25 2024-02-28 06:37:15 -05: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