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

5304 Commits

Author SHA1 Message Date
Alex Moreno 80f63f1ae2 fix: VnCard VnSearchbar props 2024-08-08 12:52:36 +02:00
Alex Moreno adc3b0307e Merge pull request 'fix(twoFactor): unify code login and twoFactor' (!603) from 7854-fix_twoFator into dev 
Reviewed-on: verdnatura/salix-front#603
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-08 10:44:28 +00:00
Jorge Penadés 85edc28a9b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-6449-summaryId 2024-08-08 12:42:10 +02:00
Alex Moreno 2f3ad52d48 duplicate notify 2024-08-08 12:36:20 +02:00
Alex Moreno ea8aca29a6 fix(twoFactor): unify code login and twoFactor 2024-08-08 12:33:26 +02:00
Jorge Penadés 0782b3ff5f chore: #6900 order params 2024-08-08 12:15:11 +02:00
Pablo Natek d23dc642cc Merge pull request 'fix: refs #7129 fix vehicle filter' (!602) from 7129-fixCreateVehicleFilter into master 
Reviewed-on: verdnatura/salix-front#602
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-08-08 09:31:26 +00:00
Pablo Natek 26628c5f2a fix: refs #7129 fix vehicle filter 2024-08-08 11:18:37 +02:00
Alex Moreno 5ac2d34125 hotFix: vnVisibleColumn fix userId 2024-08-08 10:27:27 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields 2024-08-08 10:12:54 +02:00
Jorge Penadés 0fa0ddec7e Merge branch 'dev' into 7283-itemSectionsMigration 2024-08-08 06:57:53 +00:00
Alex Moreno bc62dc9a89 Merge pull request 'feat(VnCard): use props searchbar' (!600) from vnCard-unify-searchbarParams into dev 
Reviewed-on: verdnatura/salix-front#600
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-08 06:47:47 +00:00
Alex Moreno ac1434fb9c Merge branch 'dev' into vnCard-unify-searchbarParams 2024-08-08 05:56:39 +00:00
Alex Moreno 3a77be0043 change searchbar to searchbarProps 2024-08-08 07:56:29 +02:00
Jorge Penadés 88dffbce8a Merge branch 'dev' into 7283-itemSectionsMigration 2024-08-07 13:36:34 +00:00
Jorge Penadés 50f7b11c65 Merge pull request '#7323 fix worker errors' (!599) from 7323-fixErrors into dev 
Reviewed-on: verdnatura/salix-front#599
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-07 13:32:28 +00:00
Alex Moreno afe178216c invoiceOut 2024-08-07 14:45:43 +02:00
Alex Moreno 12bd66b9ca typo 2024-08-07 14:41:57 +02:00
Alex Moreno 2f7dd0a4cb remove unecessary props 2024-08-07 14:41:30 +02:00
Alex Moreno 44e3eb779d feat(VnCard): use props searchbar 2024-08-07 14:40:28 +02:00
Jorge Penadés baf0981233 chore: refs #7323drop commented code 2024-08-07 13:37:37 +02:00
Jorge Penadés 855483cefd fix: refs #7323 css righ menu 2024-08-07 13:37:01 +02:00
Jorge Penadés 4ee6c7436f fix: refs #7323 righ menu bug 2024-08-07 13:18:13 +02:00
Jorge Penadés 06eac739cd chore: refs #7323 fix test 2024-08-07 12:57:00 +02:00
Jorge Penadés 98656aa2c8 fix: refs #7323 add department popup 2024-08-07 12:29:19 +02:00
Carlos Satorres df1b63da98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-07 12:23:22 +02:00
Carlos Satorres 6b69a16122 refs #7355 changes BasicData 2024-08-07 12:22:52 +02:00
Jorge Penadés 017d5382bb fix: refs #7323 data-key & add select 2024-08-07 12:19:26 +02:00
Jorge Penadés bd67218a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fixErrors 2024-08-07 11:58:41 +02:00
Jorge Penadés 08ed134b12 fix: refs #7323 wrong css 2024-08-07 11:57:27 +02:00
Alex Moreno f4a9577cc0 Merge pull request '6943-customer_migration_subsection-v2' (!591) from 6943-customer_migration_subsection-v2 into dev 
Reviewed-on: verdnatura/salix-front#591
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-07 08:57:13 +00:00
Alex Moreno dafa8cdebd Merge branch 'dev' into 6943-customer_migration_subsection-v2 2024-08-07 08:54:36 +00:00
Alex Moreno 9e0fba49ea fix: accountMailAlias 2024-08-07 10:38:20 +02:00
Jorge Penadés c6c2245a2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-07 10:17:14 +02:00
Alex Moreno 2cb99eb025 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-07 10:04:13 +02:00
Alex Moreno b781cfb131 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-08-07 10:03:21 +02:00
Alex Moreno f9ba6e155d hotFix: VnInputTIme 2024-08-07 10:03:20 +02:00
Jon Elias 019fc96c1b Merge pull request 'Fix: #6899 fix invoiceOut descriptor and VnTable' (!596) from hotfix_InvoiceOutMigration into master 
Reviewed-on: verdnatura/salix-front#596
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-07 07:43:49 +00:00
Alex Moreno 88d0a09324 Merge branch 'master' into hotfix_InvoiceOutMigration 2024-08-07 07:18:37 +00:00
Jon Elias 3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-07 07:25:57 +02:00
Pablo Natek 403e81c534 Merge pull request 'fix: filter and correct list' (!598) from 7129-fixFilter into master 
Reviewed-on: verdnatura/salix-front#598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-06 13:01:32 +00:00
Alex Moreno 3f5a8218d0 Merge branch 'master' into 7129-fixFilter 2024-08-06 12:56:32 +00:00
Alex Moreno ffcab60a06 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 14:31:28 +02:00
Pablo Natek 990fe65a63 fix: filter and correct list 2024-08-06 14:17:17 +02:00
Alex Moreno 1db7fd8412 hotFix(routeTicket): limit 0 2024-08-06 13:01:07 +02:00
Alex Moreno 297ac8592f Merge pull request 'fix: routeForm' (!595) from 7129-hotfix into master 
Reviewed-on: verdnatura/salix-front#595
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-06 10:19:10 +00:00
Alex Moreno c3fb30e72b Merge branch 'master' into 7129-hotfix 2024-08-06 10:15:38 +00:00
Jon Elias e8396ea338 refactor: refs #6899 added descriptors to VnTable and fix descriptor redirect 2024-08-06 11:55:44 +02:00
Alex Moreno 7e7fddb86b fix(router_basicData): transalation kmMax 2024-08-06 11:50:33 +02:00
Carlos Satorres 9a165b38c9 Merge pull request 'refs #6898 fix new list' (!594) from 6898-suppliersMigrationFix3 into master 
Reviewed-on: verdnatura/salix-front#594
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-06 09:45:46 +00:00