Commit Graph

4452 Commits

Author SHA1 Message Date
William Buezas ae73dd047f changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:55:30 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas cd01ba8fe1 changes 2024-06-26 08:36:17 -03:00
Carlos Satorres 44ba965feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 11:42:38 +02:00
Carlos Satorres efa8791b9d refs #6898 remove comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 11:40:59 +02:00
Carlos Satorres 98b125281c Merge pull request '7409-workerBalance' (!451) from 7409-workerBalance into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #451
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-26 09:40:36 +00:00
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
Carlos Satorres def8d4222b refs #6898 fix warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 11:33:02 +02:00
Carlos Satorres 1f41f8e564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 10:10:00 +02:00
Carlos Satorres 6f2573880c refs #7409 fix balance and formation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:59:37 +02:00
Jorge Penadés 752f3ace58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:38:37 +02:00
Jon Elias de2c3cc244 fix: refs #6826 fix roleDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:56:17 +02:00
Jon Elias 677e71d1a7 refactor: refs #7543 standarized descriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:26:04 +02:00
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:05:11 +02:00
Javier Segarra 2313f8ca0d Merge pull request 'Weekly tickets' (!459) from hyervoni/salix-front-mindshore:feature/WeeklyTickets into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #459
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 21:02:08 +00:00
Javier Segarra 151978160b fix: ticket order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:01:26 +02: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 d409b9ea86 fix: WorkerSelect option format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:51:26 +02:00
Javier Segarra 7a2b334a64 Merge branch 'dev' into feature/TicketTracking 2024-06-25 22:41:15 +02:00
Javier Segarra 22ccd4adfd Merge pull request 'Ticket purchase request' (!479) from hyervoni/salix-front-mindshore:feature/TicketPurchaseRequest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #479
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 20:36:52 +00:00
Javier Segarra 56560d4b50 fix: merge dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:35:20 +02:00
Javier Segarra 4e4563d481 fix: merge dev
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 22:34:19 +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
Javier Segarra d60ddfac6f Merge pull request 'Ticket basic data' (!474) from hyervoni/salix-front-mindshore:feature/TicketBasicData into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 20:28:00 +00:00
Javier Segarra 5419bc4d52 Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:27:21 +02:00
Javier Segarra 1a2b4739c3 Merge branch 'dev' into feature/TicketBasicData 2024-06-25 22:27:18 +02:00
William Buezas 6e6c6301d2 fix log view not refreshing when changing id param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 15:27:48 -03:00
William Buezas 1529e2dd4f Add tooltip to add state button
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:58:49 -03:00
William Buezas a57df459a6 Add pay button 2024-06-25 12:54:21 -03: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
Jorge Penadés fbef6f3eb1 fix: refs #7623 test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 16:18:53 +02:00
Jorge Penadés ca96e4e6e0 fix: refs #7623 bugs & tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 16:07:26 +02:00
Jorge Penadés 121204fee4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 15:37:00 +02:00
Jon Elias e733873933 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 15:21:45 +02:00
Jon Elias cff9831b88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-25 15:21:44 +02:00
Javier Segarra 0715e86530 Merge branch 'dev' into feature/WeeklyTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:49:14 +00:00
Javier Segarra d29bf09535 remove warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:48:39 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Jon Elias 1538e7dc7e Merge pull request 'feat: refs #6739 transferInvoice new checkbox and functionality' (!352) from 6739-invoiceOut into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #352
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-25 12:46:20 +00:00
Jon Elias 5aca8104be Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:41:13 +02:00
Jon Elias 31f8ab7c07 refactor: refs #6739 fix redirect transferInvoice 2024-06-25 14:41:11 +02:00
Jon Elias 975c844d65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-06-25 14:37:50 +02:00
Javier Segarra 4c8912e779 Merge pull request 'Tickets future' (!461) from hyervoni/salix-front-mindshore:feature/TicketsFuture into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #461
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 12:30:34 +00:00
Javier Segarra 3374b84f38 Merge branch 'dev' into feature/TicketsFuture
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:26:53 +00:00
Alex Moreno 1b544e0ff0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-25 14:24:59 +02:00
Alex Moreno 0776db2e0f warmFix: correct id 2024-06-25 14:24:58 +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 1a79f733f0 Merge pull request 'Tickets advance' (!462) from hyervoni/salix-front-mindshore:feature/TicketsAdvance into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 12:23:40 +00: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
Javier Segarra b47e20852e Merge pull request 'feature/TicketSale' (!445) from hyervoni/salix-front-mindshore:feature/TicketSale into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #445
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-25 12:19:59 +00:00