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

665 Commits

Author SHA1 Message Date
Carlos Satorres 258da0f60b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-20 13:16:10 +01:00
Javi Gallego 7d2f4bcf44 Merge branch 'dev' into 7346-manualInvoice 2024-11-18 15:46:08 +01:00
Javier Segarra 2bcd7061cb revert e57a253c6f 
revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev

Reviewed-on: verdnatura/salix-front#928
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 09:50:00 +00:00
Javi Gallego 79ce2ad79e Merge branch 'dev' into 7346-manualInvoice 2024-11-14 09:22:18 +01:00
Javier Segarra ef415d080a feat: refs #7308 #7308 remove warnings related to useSession 2024-11-14 08:19:19 +01:00
Carlos Satorres 847cf6a5b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-28 13:31:42 +01:00
Alex Moreno ffee9fb27c Merge branch 'dev' into fix_itemType-redirection 2024-10-28 09:14:21 +00:00
Alex Moreno cca255507a fix: itemType redirection and fix filters 2024-10-28 09:57:25 +01:00
Jorge Penadés 1da86900e6 fix: refs #7524 e2e & worker module 2024-10-27 13:43:38 +01:00
Guillermo Bonet 57a3504a7f Merge branch 'dev' into 7006-itemTypeLog 2024-10-25 11:06:49 +00:00
Carlos Satorres 56ef811584 fix: refs #7283 order translation 2024-10-24 07:47:26 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice 2024-10-21 14:01:18 +02:00
Carlos Satorres 237b3ed4df Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-18 11:17:06 +02:00
Carlos Satorres dfceb9403c fix: refs #7986 fix front 2024-10-15 07:54:52 +02:00
Carlos Satorres 1a2c5c96fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto 2024-10-14 13:52:31 +02:00
Guillermo Bonet 787ce2fc48 feat: refs #7006 itemTypeLog added 2024-10-14 09:33:00 +02:00
Carlos Satorres 855032e4a6 refs #7986 fix front 2024-10-08 15:36:57 +02:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc 2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section 2024-10-07 10:03:05 +02:00
Carlos Satorres 5d8f9dbd72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-03 13:02:56 +02:00
Javi Gallego 6d08875809 fix: icons 2024-10-02 15:37:05 +02:00
Javier Segarra 696c9ca9b3 fix: solve conflicts with stockBought 2024-10-01 11:40:29 +02:00
Javier Segarra 778e6299ce fix: solve conflicts from test to dev 2024-10-01 08:57:04 +02:00
Pablo Natek 7fa0a5b28c fix: refs #7404 path name 2024-09-30 10:47:02 +02:00
Jorge Penadés 14b7654db3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 15:16:32 +02:00
Jorge Penadés 478d4695b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 09:16:59 +02:00
Pablo Natek 1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-25 08:26:27 +02:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes 2024-09-20 09:04:31 +02:00
Carlos Satorres b2c2f42243 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-09-18 07:57:58 +02:00
Jorge Penadés 41c43fde76 feat: refs #7323 hide log section 2024-09-17 16:08:48 +02:00
Pablo Natek cead2c2b5e Merge branch 'dev' into 7404-stockBought 2024-09-17 11:40:42 +00:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-16 08:59:46 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-10 08:59:01 +02:00
Jon Elias b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:29:51 +00:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-10 08:13:56 +02:00
Jon Elias 6790067a89 Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:02:18 +00:00
Jorge Penadés 381b236a18 refactor: refs #4074 use acl & drop useless roles 2024-09-09 12:56:37 +02:00
Jorge Penadés 803ce3b909 refactor: refs #4074 rollback 2024-09-09 11:53:59 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router 2024-09-09 11:35:49 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-08 07:54:26 +02:00
Jorge Penadés d0131dd552 fix: refs #4074 drop wrong acl 2024-09-06 15:52:06 +02:00
Jorge Penadés 34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 13:23:02 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jon Elias 5d78f564dd refactor: refs #7889 deleted subtitle attr and use keyBinding instead 2024-09-06 10:00:07 +02:00
Jon Elias 585919a4d9 feat: refs #7889 added shortcuts to modules 2024-09-06 09:19:38 +02:00