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

4753 Commits

Author SHA1 Message Date
Jorge Penadés 2b7f3990ab Merge branch '7433-fixSkeleton' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-28 09:57:02 +02:00
Jorge Penadés 2c5db9716d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-28 09:56:57 +02:00
Jorge Penadés ca504ffead Merge branch 'dev' into 6943-fixCustomerGreuges 2024-06-28 07:55:00 +00:00
Jorge Penadés b8aee9738d Merge branch 'dev' into 7433-fixSkeleton 2024-06-28 07:53:15 +00:00
Carlos Satorres 8ec51ff8fd refs #6897 fix columns 2024-06-28 09:01:28 +02:00
Alex Moreno ebaaba6079 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-06-28 08:37:54 +02:00
Alex Moreno eb3eaaa4db fix: revert cypress mjs 2024-06-28 08:37:39 +02:00
Alex Moreno 8b55acf667 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-06-28 08:35:28 +02:00
Alex Moreno ba5af7258f Merge pull request 'Revert "feat: fixes #7196"' (!496) from 7196-revertCJS into dev 
Reviewed-on: verdnatura/salix-front#496
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-06-28 06:28:14 +00:00
Alex Moreno 0a8dbe8e4d Revert "feat: fixes #7196" 
This reverts commit e8e6a88066.
 2024-06-28 08:23:11 +02:00
William Buezas db4c3a6799 Changes 2024-06-27 11:46:31 -03:00
Jorge Penadés bfd8804d0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-27 14:55:46 +02:00
Jorge Penadés e8c349a550 Merge branch 'dev' into 7436-showQCheckbox 2024-06-27 12:54:35 +00:00
Jorge Penadés e610013038 Merge branch 'dev' into 7433-fixSkeleton 2024-06-27 12:53:57 +00:00
Carlos Satorres 67f89dfde2 refs #6897 fix latestbuys 2024-06-27 14:48:36 +02:00
Carlos Satorres ed4517183e refs #6897 fix trad, latestBuys 2024-06-27 14:02:45 +02:00
Alex Moreno 381a9c6d1d feat: remake vnInputDate and fix: FormModel has changes when error 2024-06-27 13:56:20 +02:00
Jorge Penadés 7c16137908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-27 13:40:49 +02:00
Alex Moreno f78ae08550 fix: cypress.config to mjs 2024-06-27 13:39:27 +02:00
William Buezas 053059997a WIP 2024-06-27 08:37:48 -03:00
Jorge Penadés e7ad147d04 fix: refs #7433 skeleton 2024-06-27 13:16:42 +02:00
Carlos Satorres 9e636c1ded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-06-27 13:01:52 +02:00
Carlos Satorres f93929de6a refs #6897 vnTable, columns 2024-06-27 13:01:00 +02:00
Jon Elias 56e63852ed Merge pull request '#6464 correct negativeBases' (!373) from 6464-fixNegativeBases into dev 
Reviewed-on: verdnatura/salix-front#373
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-27 10:30:19 +00:00
Jorge Penadés 6d71aef9e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-27 12:27:35 +02:00
Jorge Penadés ed642b299e feat: refs #7436 show checkbox 2024-06-27 12:27:04 +02:00
Jorge Penadés d3f119fa04 chore: refs #6943 check if exists 2024-06-27 10:48:55 +02:00
Jorge Penadés d0038d7e61 fix: refs #6943 removes duplicate toggle menu & fix loading animation 2024-06-27 10:45:37 +02:00
Jon Elias 95f70ba765 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-27 10:15:18 +02:00
Jon Elias fd744158ac fix: refs 6464 deleted useless class in checkbox 2024-06-27 10:15:17 +02:00
Carlos Satorres 4dd1ed3a3d refs #7366 remove summary 2024-06-27 10:12:04 +02:00
Carlos Satorres 99628d2cf8 refs #7366 remove code 2024-06-27 10:08:17 +02:00
Carlos Satorres 95a9805a84 refs #7366 fix icons actions 2024-06-27 09:53:42 +02:00
Jon Elias f6e0cb41ce Merge branch 'dev' into 6464-fixNegativeBases 2024-06-27 07:36:02 +00:00
Javi Gallego 01e44753e4 Merge pull request 'feat: fixes #7196' (!463) from 7196-cjsToEsm into dev 
Reviewed-on: verdnatura/salix-front#463
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-27 06:22:34 +00:00
Javi Gallego a8c3f1d9e5 Merge branch 'dev' into 7196-cjsToEsm 2024-06-27 06:20:03 +00:00
William Buezas 0e8106af17 Resolve conflicts 2024-06-26 17:21:31 -03:00
William Buezas 826e8ed068 changes 2024-06-26 17:19:07 -03:00
William Buezas 5b07f3015d small change 2024-06-26 17:02:21 -03:00
Carlos Satorres aaee96d6bb refs #7366 VnTable 2024-06-26 15:09:26 +02:00
Jon Elias 6bf2a8c2f6 Merge branch 'dev' into 7543-StandarizeDescriptors 2024-06-26 12:29:18 +00:00
Jon Elias 452d1000bc refactor: refs #7543 requested changes 2024-06-26 14:28:21 +02:00
Javier Segarra a5a3945582 feat: remove button from panel 2024-06-26 12:26:05 +00:00
Javier Segarra defd26fe91 feat: define Sticky Button 2024-06-26 12:25:01 +00:00
Jorge Penadés 152bd5ff08 Merge pull request '#7623 add updateRoute prop in VnPaginate' (!475) from 7623-fix-redirection into dev 
Reviewed-on: verdnatura/salix-front#475
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-26 12:21:59 +00:00
Jorge Penadés 92f9869a36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-26 14:18:57 +02:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas ae73dd047f changes 2024-06-26 08:55:30 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas cd01ba8fe1 changes 2024-06-26 08:36:17 -03:00