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

2320 Commits

Author SHA1 Message Date
Alex Moreno ee2450c82f Merge branch 'dev' into 8061_newCP 2024-11-25 12:16:18 +00:00
Alex Moreno 655a76ff62 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-25 13:03:11 +01:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-25 13:02:58 +01:00
Jon Elias f3429297cf Merge branch 'master' into Fix-ZoneLocationsTree2 2024-11-25 11:20:17 +00:00
Javier Segarra 3e06ba3c18 perf: remove console 2024-11-25 11:20:07 +00:00
Jorge Penadés e994ae72b6 fix: refs #8207 add filter to reset 2024-11-25 12:08:37 +01:00
Jorge Penadés a1284cefc2 refactor: refs #8207 add update fn 2024-11-25 12:01:28 +01:00
Jon Elias c558636799 refactor: requested changes 2024-11-25 11:12:11 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2 2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location 2024-11-25 09:21:20 +01:00
Javier Segarra fb4de9cda9 Merge branch 'dev' into 8061_newCP 2024-11-24 09:23:37 +01:00
Jorge Penadés 8b52629b0b refactor: refs #8207 improve logic 2024-11-22 15:55:30 +01:00
Jorge Penadés 3a4c0e729a refactor: refs #8207 improve logic 2024-11-22 15:52:22 +01:00
Jorge Penadés 9d8698fa2f refactor: refs #8207 improve logic 2024-11-22 15:49:07 +01:00
Jorge Penadés 661cc0b5ee refactor: refs #8207 improve logic 2024-11-22 15:37:48 +01:00
Jorge Penadés 7048f96565 refactor: refs #8207 imrove logic 2024-11-22 13:55:22 +01:00
Jorge Penadés c72fa52851 fix: refs #8207 auto-refresh 2024-11-22 13:03:23 +01:00
Alex Moreno 6276843613 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:40:27 +01:00
Alex Moreno 14d2ddfa83 fix: merge errors 2024-11-22 12:40:07 +01:00
Alex Moreno ef426dc579 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:10:34 +01:00
Alex Moreno 4913cf2c29 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 12:10:04 +01:00
Alex Moreno 94361f18fa Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 10:23:10 +00:00
Alex Moreno 142302193e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 11:21:33 +01:00
Alex Moreno 9d7f2b95e8 revert: VnVisibleColumn try catch 2024-11-22 11:21:08 +01:00
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 26c1394321 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 10:52:51 +01:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 10:52:30 +01:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error 2024-11-22 08:39:46 +01:00
Alex Moreno fdc71a13ff Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-21 10:26:38 +01:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 10:26:29 +01:00
Javier Segarra 81d7b9f04f Merge branch 'dev' into 8162-E2ETickets 2024-11-21 08:20:29 +00:00
Jon Elias 4d8d56eb6e Merge branch 'dev' into 8038-ImproveAndCorrectVnTable 2024-11-21 07:05:59 +00:00
Alex Moreno 9e41459da4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-21 07:59:53 +01:00
Alex Moreno 6b8470d6e1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 07:59:42 +01:00
Alex Moreno 44f2ecca28 chore: requested changes 2024-11-21 07:49:10 +01:00
William Buezas 8e411125bf test: refs #8162 more tests and change data-testid for data-cy 2024-11-20 18:58:08 -03:00
Javi Gallego 2a1cc49499 fix: ticketDescriptor 2024-11-20 13:15:40 +01:00
Carlos Satorres 131cd2de8c fix: options 2024-11-20 09:53:52 +01:00
Carlos Satorres c59baf9cf5 fix: fix code 2024-11-20 09:52:11 +01:00
Carlos Satorres 2806c94fdb fix: fix create bankEntity 2024-11-20 09:22:50 +01:00
Jon Elias 26ee54c488 Merge branch 'dev' into 6999-AddTabToFilter 2024-11-20 07:25:50 +00:00
Pablo Natek 8b5a2cd159 Merge branch 'dev' into 8138-add-component-ticketProblems 2024-11-20 05:02:13 +00:00
Alex Moreno a498e1178f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 14:50:14 +01:00
Alex Moreno fdafeee39d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-19 14:49:22 +01:00
Alex Moreno 7b243a470c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 14:41:47 +01:00
Alex Moreno 8714980595 fix(VnSelect): setOptions when applyFilter 2024-11-19 14:28:43 +01:00
Pablo Natek fb5e38dc0b Merge branch 'dev' into 8138-add-component-ticketProblems 2024-11-19 12:54:49 +00:00
Pablo Natek 3824f5d124 fix: refs #8138 move component from ui folder 2024-11-19 13:51:19 +01:00
Jon Elias 98017df57d fix: refs #8038 solve conflicts 2024-11-19 12:25:15 +01:00