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

590 Commits

Author SHA1 Message Date
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture 2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance 2024-06-25 14:22:00 +02:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation 2024-06-25 11:18:05 +00:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 07:32:17 +02:00
Jorge Penadés 891c0d2347 feat: refs 6238 show notes & create vnPopup 2024-06-21 13:05:28 +02:00
Carlos Satorres fdedf7bf57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:42:57 +02:00
Alex Moreno 28b241bb77 Merge branch 'dev' into 6825-vnTable 2024-06-20 10:26:05 +00:00
Pablo Natek 825762d70e Merge branch 'dev' into 7129-finishRouteMigration 2024-06-19 08:20:14 +00:00
William Buezas bb208040bb Last changes 2024-06-18 11:47:35 -03:00
Alex Moreno 8085e1e518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-18 13:25:44 +02:00
Carlos Satorres 0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-18 07:18:47 +02:00
Carlos Satorres bc30531d42 refs #6897 fix trad 2024-06-18 07:18:44 +02:00
William Buezas 06e8e819f4 WIP 2024-06-17 12:11:23 -03:00
Alex Moreno e8054467a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-17 13:00:30 +02:00
Pablo Natek 20e0c84035 fix: refs #7129 fix module routes 2024-06-14 13:10:47 +02:00
Pablo Natek d6f085dc3d Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 13:48:44 +02:00
Pablo Natek f2dddb5e30 Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 10:45:37 +02:00
Pablo Natek e10755d8fe Merge branch 'dev' into 7499-refactorEntrys 2024-06-13 05:39:13 +00:00
Guillermo Bonet 9388cb3599 Merge branch 'test' into dev 2024-06-12 12:02:12 +02:00
Guillermo Bonet 135e05b139 hotfix: refs #6636 EN i18n 2024-06-12 12:00:43 +02:00
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Alex Moreno c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 07:50:41 +02:00
Alex Moreno 048685277f Merge branch 'dev' into 6825-vnTable 2024-06-12 05:31:31 +00:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors 2024-06-11 16:38:12 +02:00
Alex Moreno 3dfe3226ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 15:00:52 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev 
Reviewed-on: verdnatura/salix-front#432
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 12:53:42 +00:00
Jon Elias 2d0b33c626 Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor 2024-06-11 14:29:44 +02:00
Jon Elias de18b670ea feat: refs #7154 changed label 2024-06-11 14:29:42 +02:00
Pablo Natek be919f97b1 Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys 2024-06-11 14:28:20 +02:00
Pablo Natek 80adeede81 fix: refs #7499 fix item reference 2024-06-11 14:28:19 +02:00
Jon Elias 989ea3d82c Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 11:49:25 +00:00
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field 2024-06-11 13:48:15 +02:00
Alex Moreno 59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-11 12:53:50 +02:00
Alex Moreno f753eddc43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 11:40:58 +02:00
Javi Gallego 0e0e351805 Merge branch 'dev' into 7548-ticketSummaryCollection 2024-06-10 10:53:33 +02:00
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-07 12:03:52 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Pablo Natek 68e49e2ffa fix: refs #7129 fix some issues on load and tools 2024-06-07 07:52:50 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles 2024-06-06 07:32:15 +00:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse 2024-06-03 16:30:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation 2024-06-03 09:30:37 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
William Buezas 4bd78922af remove unnecesary files 2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
Alex Moreno 2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 14:05:42 +02:00