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

7347 Commits

Author SHA1 Message Date
Carlos Satorres 2c492e88d5 Merge pull request 'refs #7529 create WorkerPIT' (!442) from 7529-workerPIT into dev 
Reviewed-on: verdnatura/salix-front#442
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 13:05:32 +00:00
Carlos Satorres dfcaf4e692 fix: refs #7529 fix e2e 2024-11-25 13:53:22 +01:00
Carlos Satorres 2bc2217406 fix: refs #7529 fix workerPit e2e 2024-11-25 13:49:01 +01:00
Carlos Satorres 5dd508c559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-25 13:31:02 +01:00
Javier Segarra ec96f6bea7 Merge pull request 'fix: #8061 Handle new CP' (!948) from 8061_newCP into dev 
Reviewed-on: verdnatura/salix-front#948
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 12:17:13 +00:00
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 843c54fcc1 Merge pull request 'Hotfix: ZoneLocationsTree' (!995) from Fix-ZoneLocationsTree2 into master 
Reviewed-on: verdnatura/salix-front#995
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:56:30 +00:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons 2024-11-25 12:54:15 +01:00
Javier Segarra a99f64f66a Merge branch 'dev' into 8061_newCP 2024-11-25 11:20:20 +00: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
Jon Elias d191d88e81 refactor: modified button to prevent submit 2024-11-25 12:19:20 +01:00
Javier Segarra caca9aea71 Merge pull request 'Add reportFileName option' (!993) from cypress_reporterFileName into dev 
Reviewed-on: verdnatura/salix-front#993
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:18:43 +00:00
Jorge Penadés 6c30ea9e7a Merge pull request '#8207 hotfix-tableActions' (!991) from 8207-hotfix-tableActions into master 
Reviewed-on: verdnatura/salix-front#991
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:13:45 +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
Jorge Penadés a3f56aaf24 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions 2024-11-25 10:27:00 +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 b8ac82bc75 feat: add reportFileName option 2024-11-24 16:41:21 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated 2024-11-24 11:53:40 +01:00
Javier Segarra feb752f75c perf: refs #8061 solve conflicts and random posCode it 2024-11-24 09:31:43 +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
Alex Moreno 01ffb663f1 fix(ClaimList): stateCode orderBy priority 2024-11-22 15:14:03 +01:00
Jorge Penadés 0eeb22d40a chore: refs #8207 drop useless code 2024-11-22 13:56:30 +01:00
Jorge Penadés 7048f96565 refactor: refs #8207 imrove logic 2024-11-22 13:55:22 +01:00
Jorge Penadés 50fbf64cf9 fix: refs #8207 update btn wip 2024-11-22 13:33:35 +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
Javier Segarra 651b67e98f Merge pull request 'fix: orderCatalogFilter and fix useArrayData' (!989) from hotFix_orderCatalogFilter_refactor_fix into master 
Reviewed-on: verdnatura/salix-front#989
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-22 10:24:18 +00: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 2db0369b74 fix: resetCategory 2024-11-22 11:05:48 +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 9019d4ff90 Merge pull request 'fix: remove all try catch(err) (error) console.error' (!988) from hotFix_tryCatch_badPractice into master 
Reviewed-on: verdnatura/salix-front#988
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-22 09:47:32 +00:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Jorge Penadés 55f9023201 Merge pull request '#7229 download file' (!833) from 7229-fixDownloadFile into dev 
Reviewed-on: verdnatura/salix-front#833
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-22 09:34:31 +00:00