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

9815 Commits

Author SHA1 Message Date
Jorge Penadés f991aa0aa8 Merge branch '6919-syncData' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 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 6732effe0c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-removeLimit 2025-02-06 10:30:16 +01:00
Alex Moreno c6758c3346 Merge pull request 'fix: use userFilter to keep includes' (!1340) from hotFix_use_userFilter into master 
Reviewed-on: verdnatura/salix-front#1340
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-06 09:26:02 +00:00
Jorge Penadés 85c4d79443 Merge pull request '#7119 add VehicleList page and routing configuration' (!1129) from 7119-createVehicle into dev 
Reviewed-on: verdnatura/salix-front#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 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 2025-02-06 10:13:40 +01:00
Alex Moreno a1555a4c54 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-06 10:13:36 +01:00
Alex Moreno ab2d3fc4dc fix: use userFilter to keep includes 2025-02-06 10:12:52 +01:00
Jorge Penadés 80337c61df fix: refs #7524 dynamic fetch 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 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 
Reviewed-on: verdnatura/salix-front#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 2025-02-06 08:47:50 +00:00
Alex Moreno 2ed9323f0f fix(VnLog): load filters 2025-02-06 08:23:46 +01:00
Javier Segarra a06cfa12a4 Merge pull request 'perf: keyshortcut directive' (!1315) from improve_shortcut_directive into dev 
Reviewed-on: verdnatura/salix-front#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 2025-02-05 22:06:08 +00:00
Javier Segarra 698edfbe72 feat: refs #7058 expect parent 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 2025-02-05 15:08:25 +00:00
Jon Elias fac0e21ffd Merge branch 'dev' into 8246-ZoneAddressFk2 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 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 2025-02-05 12:56:00 +00:00
Javier Segarra 7ece059610 test: refs #7058 clean comments 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 2025-02-05 13:48:06 +01:00
Alex Moreno 676ce400ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-05 13:47:58 +01:00
Alex Moreno 1b52468e14 fix: translation 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 
Reviewed-on: verdnatura/salix-front#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 
Reviewed-on: verdnatura/salix-front#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 2025-02-05 12:23:23 +00:00
Javier Segarra cf7bcdae7a Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334) 
Reviewed-on: verdnatura/salix-front#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 
Reviewed-on: verdnatura/salix-front#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 2025-02-05 12:18:28 +00:00
Javier Segarra 0d2aada01f Merge branch 'dev' into improve_shortcut_directive 2025-02-05 12:18:00 +00:00
Jon Elias 4848a89ca2 fix: fixed summary dialog width 2025-02-05 13:17:31 +01:00
Carlos Satorres 018327a9ec Merge branch 'dev' into 6426-refactorConstants 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 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 2025-02-05 12:16:02 +01:00
Alex Moreno 65b5094e23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-05 12:15:56 +01:00
Alex Moreno 5696a44c1b fix: empty order 2025-02-05 12:15:30 +01:00
Alex Moreno 5078559668 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-05 12:04:33 +01:00
Alex Moreno a25744c4a4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-05 12:04:16 +01:00
Alex Moreno 6e8f2754e5 fix: empty order 2025-02-05 12:00:34 +01:00
Alex Moreno 82cc153c98 fix: empty order 2025-02-05 12:00:19 +01:00
Alex Moreno 93ece4bf07 fix: empty order 2025-02-05 11:58:30 +01:00
Alex Moreno 4b66a8dea5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-05 11:52:04 +01:00