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

1807 Commits

Author SHA1 Message Date
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
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
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
Pablo Natek b092c5af6d refs 6486 commit 2024-02-26 15:00:14 +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 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
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon 2024-02-22 10:57:11 +01:00
Alex Moreno 00bed4fd61 refs #5509 fix(FormModel): autoLoad && formInitalData 2024-02-22 10:20:44 +01:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-22 09:11:36 +01:00
Alex Moreno 33eef88825 refs #5509 fix: e2e 2024-02-21 14:00:52 +01:00
Alex Moreno cda0511247 refs #6797 fix(jenkins) momentarily old package.json 2024-02-21 13:43:33 +01:00
Alex Moreno d1e1a8e1fa refs #6797 fix(jenkins) momentarily old package.json 2024-02-21 13:41:41 +01:00
Alex Moreno 4059f168f6 refs #6797 fix(jenkins) momentarily use bun 2024-02-21 13:37:33 +01:00
Alex Moreno ed17fa0670 refs #6797 fix(jenkins) momentarily use npm 2024-02-21 13:36:47 +01:00
Alex Moreno 4ac9dc3148 refs #6797 fix(jenkins) momentarily 2024-02-21 13:35:33 +01:00
Alex Moreno 6d3bed2db6 refs #6797 fix(jenkins) momentarily 2024-02-21 13:34:31 +01:00
Alex Moreno 74c4a7157b refs #6797 fix(jenkins) remove chormium 2024-02-21 13:21:31 +01:00
Alex Moreno b75afd6ec5 refs #6797 fix(jenkins) use pnpm 2024-02-21 13:16:59 +01:00
Alex Moreno 841544767e refs #6797 feat(jenkins) use pnpm 2024-02-21 13:14:04 +01:00
Alex Moreno 5d50ddd4db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-21 12:15:17 +01:00
Alex Moreno 1bb0d0db94 refs #6797 feat(Dockerfile) use bun 2024-02-21 12:15:16 +01:00
Carlos Satorres 2630b5851c Merge pull request 'refs #6763 click' (!170) from 6763-vnTreeRefact into dev 
Reviewed-on: verdnatura/salix-front#170
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-21 11:12:10 +00:00
Carlos Satorres d64c1f4b02 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-21 11:10:20 +00:00
Alex Moreno 30b8e25a74 refs #6797 feat(jenkins) deploy dev-lilium 2024-02-21 12:08:49 +01:00
Alex Moreno 71f2c173cc refs #6797 feat(jenkins) deploy dev-lilium 2024-02-21 12:04:55 +01:00
Alex Moreno c184851b26 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-21 08:49:40 +00:00
Alex Moreno a3ad94e2b5 refs #6797 feat(jenkins) deploy dev-lilium FRONT_REPLICAS 2024-02-21 07:31:48 +01:00
Alex Moreno 87c5e6fe60 refs #6797 feat(jenkins) deploy dev-lilium 2024-02-20 15:05:50 +01:00
Alex Moreno df2bb66538 refs #6797 feat(jenkins) deploy dev-lilium 2024-02-20 14:59:46 +01:00
Alex Moreno 6afb9ed570 refs #6797 feat(jenkins) deploy dev-lilium 2024-02-20 14:40:35 +01:00
Alex Moreno 64b2d8e169 Merge pull request 'refs #6797 feat: deploy dev branch and use bun' (!179) from 6797-deployDev-useBun into dev 
Reviewed-on: verdnatura/salix-front#179
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-02-20 13:17:36 +00:00
Alex Moreno ce340afa93 Merge branch 'dev' into 6797-deployDev-useBun 2024-02-20 10:52:58 +00:00