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

10133 Commits

Author SHA1 Message Date
Javier Segarra 314f656965 Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2025-02-07 07:56:29 +01:00
Jon Elias 43b6ff89be fix: fixed company filter 2025-02-07 07:56:08 +01:00
Javier Segarra 14c7ec2e39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2025-02-07 07:54:21 +01:00
Javier Segarra eb9ab710c4 Merge branch 'dev' into 6321_negative_tickets 2025-02-07 06:41:08 +00:00
Alex Moreno 1a420abfb2 Merge branch 'dev' of https: refs #8322//gitea.verdnatura.es/verdnatura/salix-front into 8322-Supplier 2025-02-07 07:39:47 +01:00
Alex Moreno 3021e38ae8 fix: hotfix fetchData not use userFilter 2025-02-07 07:32:28 +01:00
Jose Antonio Tubau f6e53e478f fix: refs #7318 fixed claim summary warnings 2025-02-07 07:27:36 +01:00
Alex Moreno 2fea795bdb fix: hotfix empty observations 2025-02-07 07:21:59 +01:00
PAU ROVIRA ROSALENY e77e96ffed Merge branch 'dev' into 7065-testUserPanel 2025-02-07 06:02:05 +00:00
Alex Moreno fc44424dda Merge branch 'dev' into 7119-showCountryName 2025-02-07 06:00:54 +00:00
Javier Segarra 4994a94369 Merge pull request '#7058 LeftMenu vitest' (!1153) from 7058_leftMenu_vitest into dev 
Reviewed-on: verdnatura/salix-front#1153
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-06 21:45:16 +00:00
Javier Segarra 48e40cdc46 Merge branch 'dev' into 7058_leftMenu_vitest 2025-02-06 21:44:27 +00:00
Javier Segarra 220fb057e6 feat: refs #6321 requested changes 2025-02-06 18:00:18 +01:00
Jorge Penadés 5e17af2fae feat: refs #7119 show country name 2025-02-06 16:19:38 +01:00
Javier Segarra d7b9a01c57 Merge branch 'dev' into 6321_negative_tickets 2025-02-06 14:58:28 +00:00
Javier Segarra ceef46eccc feat: refs #6321 remove ticketConfig 2025-02-06 15:18:35 +01:00
Jon Elias 504fee11a0 Merge branch '8246-ZoneAddressFk2' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2 2025-02-06 14:21:14 +01:00
Jon Elias 1395c0da80 Merge branch 'dev' of https: refs #8246//gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2 2025-02-06 14:21:12 +01:00
Robert Ferrús 72e9637ef0 Merge pull request 'feat: refs #6822 change traduction Partial delay' (!1341) from 6822-changeTitlePartialDelay into test 
Reviewed-on: verdnatura/salix-front#1341
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-06 12:51:10 +00:00
Javier Segarra e8a90faa62 feat: add agency icon 2025-02-06 12:33:26 +00:00
Alex Moreno 07eacdcebf fix: refs #6426 constants 2025-02-06 12:42:00 +01:00
PAU ROVIRA ROSALENY 035979cb70 Merge branch 'dev' into 7065-testUserPanel 2025-02-06 11:09:59 +00:00
Carlos Satorres 117ce937fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants 2025-02-06 11:58:01 +01:00
Carlos Satorres 64a52e0183 fix: refs #6426 outLayout 2025-02-06 11:57:27 +01:00
Robert Ferrús 3a7366c91a feat: refs #6822 change traduction Partial delay 2025-02-06 11:47:14 +01:00
Alex Moreno 063ac0cb7b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-06 11:00:10 +01:00
Alex Moreno 671018ea2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-06 10:59:30 +01:00
PAU ROVIRA ROSALENY 828bb61f52 Merge branch 'dev' into 7065-testUserPanel 2025-02-06 09:51:52 +00:00
Jorge Penadés 63a8f0f3c7 Merge pull request '#6919 syncData' (!941) from 6919-syncData into dev 
Reviewed-on: verdnatura/salix-front#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 2025-02-06 09:33:05 +00:00
Jorge Penadés f9ba0642e1 Merge pull request '#7524 dynamic fetch' (!1339) from 7524-hotfix-removeLimit into master 
Reviewed-on: verdnatura/salix-front#1339
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-06 09:32:44 +00:00
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
PAU ROVIRA ROSALENY 4ad2f936e8 Merge branch 'dev' into 7065-testUserPanel 2025-02-06 07:44:51 +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
PAU ROVIRA ROSALENY 85140999ab Actualizar src/components/__tests__/UserPanel.spec.js 2025-02-06 06:56:29 +00:00