Commit Graph

9701 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY 828bb61f52 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 09:51:52 +00:00
Jorge Penadés 63a8f0f3c7 Merge pull request '#6919 syncData' (!941) from 6919-syncData into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #941
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-06 09:39:48 +00:00
PAU ROVIRA ROSALENY 9767668798 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 09:33:05 +00:00
Jorge Penadés f991aa0aa8 Merge branch '6919-syncData' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 10:32:02 +01:00
Jorge Penadés 848d00a8b3 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-02-06 10:32:00 +01:00
Jorge Penadés 85c4d79443 Merge pull request '#7119 add VehicleList page and routing configuration' (!1129) from 7119-createVehicle into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1129
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-06 09:24:15 +00:00
Jorge Penadés f37294f229 Merge branch '7119-createVehicle' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 10:20:43 +01:00
Jorge Penadés 017f435da6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-02-06 10:20:29 +01:00
Alex Moreno ae36d676f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-02-06 10:13:40 +01:00
Alex Moreno a1555a4c54 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 10:13:36 +01:00
Alex Moreno a88696d590 Merge pull request 'fix(VnLog): load filters' (!1338) from hotFix_VnLog_filters into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-06 08:48:26 +00:00
PAU ROVIRA ROSALENY 4ad2f936e8 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 07:44:51 +00:00
Alex Moreno 2ed9323f0f fix(VnLog): load filters
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 08:23:46 +01:00
Javier Segarra a06cfa12a4 Merge pull request 'perf: keyshortcut directive' (!1315) from improve_shortcut_directive into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1315
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-02-06 07:14:22 +00:00
PAU ROVIRA ROSALENY 85140999ab Actualizar src/components/__tests__/UserPanel.spec.js
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 06:56:29 +00:00
Javier Segarra 841195eca0 Merge branch 'dev' into improve_shortcut_directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 22:06:08 +00:00
Alex Moreno a338dbed70 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 13:48:06 +01:00
Alex Moreno 676ce400ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:47:58 +01:00
Alex Moreno 1b52468e14 fix: translation
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 13:47:44 +01:00
Jose Antonio Tubau 3aa5bdac92 Merge pull request 'feat: refs #8304 added remove option to operator' (!1195) from 8304-workerChangesAndFixes into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1195
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:25:26 +00:00
Jon Elias 883eb7d57a Merge pull request 'Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334)' (!1335) from warmfix_ticketSummary_width into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1335
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-05 12:24:58 +00:00
Jose Antonio Tubau c6cf2ed144 Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:23:23 +00:00
Javier Segarra cf7bcdae7a Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334)
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #1334
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:21:39 +00:00
Javier Segarra c8943e43fd Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334) from Fix-MonitorTicketSummaryDialog into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1334
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:19:14 +00:00
Javier Segarra b0b04ad017 Merge branch 'dev' into Fix-MonitorTicketSummaryDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:18:28 +00:00
Javier Segarra 0d2aada01f Merge branch 'dev' into improve_shortcut_directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:18:00 +00:00
Jon Elias 4848a89ca2 fix: fixed summary dialog width
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:17:31 +01:00
Alex Moreno 2eb38382f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:16:02 +01:00
Alex Moreno 65b5094e23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:15:56 +01:00
Alex Moreno 5696a44c1b fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:15:30 +01:00
Alex Moreno 5078559668 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:04:33 +01:00
Alex Moreno a25744c4a4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:04:16 +01:00
Alex Moreno 6e8f2754e5 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:00:34 +01:00
Alex Moreno 82cc153c98 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:00:19 +01:00
Alex Moreno 93ece4bf07 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:58:30 +01:00
Alex Moreno 4b66a8dea5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:52:04 +01:00
Alex Moreno f7db8d671c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:49:58 +01:00
Alex Moreno 43284e3b79 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:49:53 +01:00
Alex Moreno 0b7f2895a7 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 11:42:29 +01:00
Alex Moreno 2f6adfc515 Merge branch 'dev' into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 10:22:15 +00:00
Alex Moreno 7364f055b7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:16:29 +01:00
Alex Moreno 924d921b70 test: fix VnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:16:21 +01:00
Alex Moreno 54962fbb56 fix: workerSummary 2025-02-05 11:16:02 +01:00
Jon Elias f132912da7 Merge pull request '#6242: Show all ticket problems' (!1331) from 6242-AddHasRoundingField into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1331
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:51:40 +00:00
Jon Elias f88fb130c6 Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 06:50:36 +00:00
Alex Moreno 23ae5d7b4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 07:40:30 +01:00
Alex Moreno 9ff1d3fa83 Merge pull request 'fix: update selector for buyLabel button in myEntry.spec.js' (!1329) from fix-myEntryTest into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1329
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:40:02 +00:00
Alex Moreno b5ae9ab0c5 Merge branch 'test' into fix-myEntryTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-05 06:37:11 +00:00
Alex Moreno 0ecdaf89e7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 07:25:36 +01:00
Alex Moreno 8c6a61a165 Merge pull request 'Warmfix[Wagon]: Fixed wagons e2e' (!1330) from Fix-WagonModuleE2E into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1330
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:20:32 +00:00