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

4470 Commits

Author SHA1 Message Date
Jorge Penadés bf9a731bcc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-28 15:10:52 +02:00
Carlos Satorres 41d6c3f07e refs #6897 fix columns trad 2024-06-28 15:00:35 +02:00
Jon Elias 685267e177 Merge pull request '#6826 added rol summary link' (!481) from 6826-RolSummary into dev 
Reviewed-on: verdnatura/salix-front#481
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-28 12:59:37 +00:00
Jon Elias 9664978733 Merge branch 'dev' into 6826-RolSummary 2024-06-28 12:58:51 +00:00
Jon Elias 3722ad0995 Merge pull request '#5447 changed warehouse out filter' (!397) from 5447-travelExtraCommunity into dev 
Reviewed-on: verdnatura/salix-front#397
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-28 12:57:02 +00:00
Carlos Satorres e62e914e48 refs #6897 change image, fit component 2024-06-28 14:55:44 +02:00
Carlos Satorres 9fe5fd2391 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-06-28 13:33:02 +02:00
Jon Elias 6ee5fc954b fix: refs #6826 fix redirect 2024-06-28 13:26:53 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService 2024-06-28 13:24:24 +02:00
Jon Elias 25e4494266 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-28 11:17:10 +00:00
Jon Elias a3704ce456 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6826-RolSummary 2024-06-28 13:13:53 +02:00
Jorge Penadés 06420fcbef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-28 12:52:40 +02:00
Jorge Penadés 63a05130e3 chore: refs #7436 fix e2e 2024-06-28 12:46:14 +02:00
Jon Elias 93c109b70d refactor: new translations 2024-06-28 11:25:38 +02:00
Carlos Satorres b05528ae14 refs #6897 fix latestbuys trad 2024-06-28 11:23:29 +02:00
Jorge Penadés ffdcb28522 refactor: refs #6943 initialize totalAmount as undefined 2024-06-28 11:17:42 +02:00
Javier Segarra 68552b8da9 perf: add QBtn in CardDescriptor instead each ModuleDescriptor 2024-06-28 11:07:32 +02:00
Jon Elias 8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations 2024-06-28 10:58:57 +02:00
Jon Elias 369cb9dc75 refactor: refs #7030 added translations 2024-06-28 10:56:09 +02:00
Jorge Penadés 9d03e0e487 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomerGreuges 2024-06-28 10:24:23 +02:00
Jorge Penadés e8ade1fd1d Merge branch '7436-showQCheckbox' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-28 10:21:50 +02:00
Jorge Penadés 97c84f7aaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-28 10:21:47 +02:00
Jorge Penadés 86a016e375 Merge pull request '#7433 fix skeleton' (!493) from 7433-fixSkeleton into dev 
Reviewed-on: verdnatura/salix-front#493
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-28 08:19:46 +00:00
Jon Elias ec5eeaa308 fix: refs #6151 fixed filters and styles 2024-06-28 10:14:24 +02:00
Carlos Satorres 2e8396d1d4 refs #6897 fix url 2024-06-28 10:08:19 +02:00
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
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