Commit Graph

9807 Commits

Author SHA1 Message Date
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 ab2d3fc4dc fix: use userFilter to keep includes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:12:52 +01:00
Jorge Penadés 80337c61df fix: refs #7524 dynamic fetch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:09:30 +01:00
Carlos Satorres 5d7bfec177 Merge branch '6426-refactorConstants' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 09:53:13 +01:00
Carlos Satorres ded1dae481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants 2025-02-06 09:53:09 +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
Carlos Satorres 502f41993a Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 08:47:50 +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
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
Javier Segarra 698edfbe72 feat: refs #7058 expect parent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 23:03:43 +01:00
Javier Segarra 97dfeca20d fix: refs #7058 remove comment 2025-02-05 23:00:23 +01:00
Carlos Satorres 5cb2b326f1 Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 15:08:25 +00:00
Jon Elias fac0e21ffd Merge branch 'dev' into 8246-ZoneAddressFk2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:42:09 +00:00
Jon Elias 6eae05b7d0 Merge branch '8246-ZoneAddressFk2' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 14:40:05 +01:00
Jon Elias 41c8760707 refactor: refs #8246 added filter to searchbar due to data key 2025-02-05 14:40:04 +01:00
Javier Segarra b5b52dcda0 Merge branch 'dev' into 7058_leftMenu_vitest
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 12:56:00 +00:00
Javier Segarra 7ece059610 test: refs #7058 clean comments
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-05 13:55:47 +01:00
Javier Segarra fcdc69d7c8 test: refs #7058 pass both tests 2025-02-05 13:48:29 +01: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
Carlos Satorres 018327a9ec Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 11:51:30 +00:00
Carlos Satorres 896626a1fd Merge branch '6426-refactorConstants' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 12:51:06 +01:00
Carlos Satorres b45e529879 fix: refs #6426 fix constants 2025-02-05 12:51:04 +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
Javier Segarra 5e2158daf4 test: refs #7058 chnges requested
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 08:29:08 +01:00