Commit Graph

600 Commits

Author SHA1 Message Date
Carlos Satorres c570f2058b Merge branch 'dev' into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:37:52 +00:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:59:16 +02:00
Javier Segarra c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 22:31:52 +02:00
Carlos Satorres 6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 17:04:47 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:22:00 +02:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 11:18:05 +00:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-25 07:32:17 +02:00
Jorge Penadés 891c0d2347 feat: refs 6238 show notes & create vnPopup
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-21 13:05:28 +02:00
Carlos Satorres 87a9ee5ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-21 09:50:38 +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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-20 10:26:05 +00:00
William Buezas b3a4dd3f79 Ticket purchase request
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-19 08:16:20 -03:00
Pablo Natek 825762d70e Merge branch 'dev' into 7129-finishRouteMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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 84378187be Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:56:23 +02:00
Carlos Satorres 0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
Carlos Satorres 0ccfd9ae75 refs #7409 columns trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 15:50:33 +02:00
William Buezas c807b5feb2 Weekly tickets 2024-06-17 08:21:43 -03:00
Alex Moreno e8054467a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-13 05:39:13 +00:00
Guillermo Bonet 9388cb3599 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-12 12:02:12 +02:00
Guillermo Bonet 135e05b139 hotfix: refs #6636 EN i18n
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-12 12:00:43 +02:00
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 05:31:31 +00:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 15:00:52 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 11:49:25 +00:00
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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