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

3254 Commits

Author SHA1 Message Date
Pablo Natek dfc7e704fe Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-01 13:02:59 +01:00
Pablo Natek ac536d27ea remove(variables). refs #6486 remove old variables 2024-03-01 13:02:58 +01:00
Jorge Penadés 07034499b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-01 12:24:29 +01:00
Jorge Penadés b5edc98732 fix: refs #5186 add all fields basic data & summary 2024-03-01 12:12:44 +01:00
Jorge Penadés 37985d853b fix: refs #5186 add locale 2024-03-01 11:55:25 +01:00
Jorge Penadés 67d97eef8f fix: refs #5186 add searchbar 2024-03-01 11:19:40 +01:00
Jorge Penadés ebbe38a14e fix: refs #5186 parking routes 2024-03-01 11:05:34 +01:00
Pablo Natek eca0997db5 remove(style): refs #6486 remove from claimCard 2024-03-01 10:51:58 +01:00
Pablo Natek c18a974ff8 Merge branch 'dev' into 6486-salixColors 2024-03-01 09:51:12 +00:00
Pablo Natek be9b70d9f5 move(style): refs #6486 order style 2024-03-01 10:47:20 +01:00
Pablo Natek bc4e081bee fix(light): refs #6486 add light theme colors 2024-03-01 10:33:23 +01:00
Alex Moreno 4abb230180 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-01 10:26:38 +01:00
Jorge Penadés 46bcba99bc fix: refs #5186 margin top 2024-03-01 09:59:32 +01:00
Alex Moreno 7a9188317b Merge pull request 'refs #5509 fix(FormModel) $props.formInitialData' (!218) from warmFix-claimBasicData into test 
Reviewed-on: verdnatura/salix-front#218
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-03-01 08:55:11 +00:00
Pablo Natek 02959ca8a5 feat(colors): refs #6486 add salix-colors 2024-03-01 09:45:17 +01:00
Alex Moreno 37160158ce refs #5509 fix(FormModel) $props.formInitialData 2024-03-01 09:33:59 +01:00
Alex Moreno 28dbc76fe6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-01 09:26:18 +01:00
Alex Moreno 2105e3880b refs #6175 warmFix(WorkSummary): nullables 2024-03-01 09:26:17 +01:00
Alex Moreno e87a8f8154 Merge pull request 'warmFix row' (!217) from warmFix-entrySummary into test 
Reviewed-on: verdnatura/salix-front#217
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-01 08:07:16 +00:00
Carlos Satorres a1b377c844 warmFix remove div col 2024-03-01 08:59:50 +01:00
Carlos Satorres 91a137b072 warmFix row 2024-03-01 08:53:53 +01:00
Jorge Penadés d0c34e3238 Merge pull request '#6317 create vnCurrency' (!181) from 6317-createVnCurrency into dev 
Reviewed-on: verdnatura/salix-front#181
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-01 07:39:06 +00:00
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