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

9270 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY 1744524949 Merge branch 'dev' into 8422-e2eItemTag 2025-01-31 08:18:08 +00:00
PAU ROVIRA ROSALENY bd2db2ef58 Merge pull request 'fix: #8425 fixed zoneWarehouse e2e test not working' (!1304) from 8423-e2eZoneWarehouse into dev 
Reviewed-on: verdnatura/salix-front#1304
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-31 07:49:19 +00:00
PAU ROVIRA ROSALENY bcc4e5ba44 Merge branch 'dev' into 8422-e2eItemTag 2025-01-31 06:52:55 +00:00
PAU ROVIRA ROSALENY 2f80bc90af fix: refs #8422 optimized get and dataCy 2025-01-31 07:52:09 +01:00
PAU ROVIRA ROSALENY 023593eb45 Merge branch 'dev' into 8423-e2eZoneWarehouse 2025-01-31 05:21:12 +00:00
Jon Elias 67872aca10 Merge pull request '#8419: Modified list and fixed e2e' (!1302) from 8419-FixInvoiceInCorrectiveE2E into dev 
Reviewed-on: verdnatura/salix-front#1302
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-31 05:10:56 +00:00
Jon Elias 59ca61c96f Merge branch 'dev' into 8419-FixInvoiceInCorrectiveE2E 2025-01-31 05:06:59 +00:00
PAU ROVIRA ROSALENY e13f46613f Merge branch 'dev' into 8423-e2eZoneWarehouse 2025-01-31 04:51:53 +00:00
Jorge Penadés f3042b0326 Merge pull request 'feat: add inactive car icon' (!1314) from updateIcons into dev 
Reviewed-on: verdnatura/salix-front#1314
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-30 15:07:17 +00:00
Jorge Penadés b383efd99a feat: add inactive car icon 2025-01-30 15:38:14 +01:00
Jon Elias 22ae08863b Merge pull request '#8409: Added VnSelectSupplier' (!1274) from 8409-VnSelectSupplier into dev 
Reviewed-on: verdnatura/salix-front#1274
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-30 14:20:06 +00:00
Jon Elias 788c6e8b61 Merge branch 'dev' into 8409-VnSelectSupplier 2025-01-30 12:53:56 +00:00
Jon Elias 7547461282 Merge branch '8409-VnSelectSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 8409-VnSelectSupplier 2025-01-30 13:52:23 +01:00
Jon Elias ed211ba14b refactor: refs #8409 deleted unused variable 2025-01-30 13:52:22 +01:00
PAU ROVIRA ROSALENY 47603d1315 Merge branch 'dev' into 8423-e2eZoneWarehouse 2025-01-30 11:40:16 +00:00
PAU ROVIRA ROSALENY f6fc19f210 Merge branch '8423-e2eZoneWarehouse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8423-e2eZoneWarehouse 2025-01-30 12:38:54 +01:00
PAU ROVIRA ROSALENY ed0f33dbc5 fix: refs #8423 used dataCy to get data-cy 2025-01-30 12:38:50 +01:00
Jon Elias 6522df24b4 Merge pull request 'Fix[invoiceOutE2E]: Fixed InvoiceOutList e2e' (!1310) from Fix-InvoiceOutListE2E into dev 
Reviewed-on: verdnatura/salix-front#1310
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-30 07:42:55 +00:00
Javier Segarra b90f6b037c Merge branch 'dev' into Fix-InvoiceOutListE2E 2025-01-30 07:19:47 +00:00
Jon Elias 71b5b8d47a fix: fixed InvoiceOutList e2e 2025-01-30 08:10:26 +01:00
Javier Segarra 68d1e1662e Merge pull request '#7826 - Fix' (!1285) from 7826_fix into dev 
Reviewed-on: verdnatura/salix-front#1285
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-29 15:40:16 +00:00
Javier Segarra dd3059b609 Merge branch 'dev' into 7826_fix 2025-01-29 15:19:55 +00:00
Javier Segarra ae0f08b2c6 Merge pull request '#7405 vueDocs' (!1284) from 7405-vueDocs into dev 
Reviewed-on: verdnatura/salix-front#1284
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-29 15:19:32 +00:00
Javier Segarra ebf2345fea Merge branch 'dev' into 7405-vueDocs 2025-01-29 15:18:40 +00:00
Javier Segarra 96b05de066 Merge branch 'dev' into 7826_fix 2025-01-29 15:18:03 +00:00
Javier Segarra b7a841d998 Merge pull request '#7134 - supplierBalance' (!1306) from 7134-supplierBalance into dev 
Reviewed-on: verdnatura/salix-front#1306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-29 15:16:49 +00:00
Javier Segarra 8c680b375a Merge branch 'dev' into 7405-vueDocs 2025-01-29 16:16:24 +01:00
Javier Segarra dc65f7ad20 Merge branch 'dev' into 7826_fix 2025-01-29 15:14:34 +00:00
Javier Segarra b87191c4d9 Merge branch 'dev' into 7134-supplierBalance 2025-01-29 15:13:41 +00:00
Alex Moreno f3854d9682 fix: routeCard use customUrl 2025-01-29 12:08:27 +01:00
Alex Moreno c9adf048cc fix: rightAdvancedMenu 2025-01-29 12:03:45 +01:00
Jon Elias 8ada6bd3e3 Merge branch 'dev' into 8409-VnSelectSupplier 2025-01-29 10:59:52 +00:00
Jon Elias 613ebc0eb4 refactor: refs #8409 use defineModel instead or defineProps 2025-01-29 11:58:19 +01:00
Carlos Satorres d6338f1988 Merge pull request '7917-freelancerRoute' (!1307) from 7917-freelancerRoute into dev 
Reviewed-on: verdnatura/salix-front#1307
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-29 10:37:11 +00:00
PAU ROVIRA ROSALENY 8d2d73be46 Merge branch 'dev' into 8422-e2eItemTag 2025-01-29 10:34:28 +00:00
Javier Segarra 2fb7db051c Merge branch 'dev' into 7134-supplierBalance 2025-01-29 08:55:44 +00:00
Javier Segarra 2be0f515c8 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance 2025-01-29 09:54:19 +01:00
Carlos Satorres 6d1767207c Merge branch 'dev' into 7917-freelancerRoute 2025-01-29 08:05:27 +00:00
Carlos Satorres 19769b1a8b Merge pull request 'fix: refs #8352 fix rightPanel vnLog' (!1280) from 8352-fixVnLog into dev 
Reviewed-on: verdnatura/salix-front#1280
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-29 08:05:07 +00:00
Carlos Satorres 2baa7c02f0 Merge branch 'dev' into 8352-fixVnLog 2025-01-29 08:03:22 +00:00
PAU ROVIRA ROSALENY 9c790f734c Merge branch 'dev' into 8423-e2eZoneWarehouse 2025-01-29 07:32:46 +00:00
PAU ROVIRA ROSALENY 2dbda38ae7 Merge branch '8423-e2eZoneWarehouse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8423-e2eZoneWarehouse 2025-01-29 08:32:07 +01:00
PAU ROVIRA ROSALENY 95f96d7ebd fix: refs #8423 removed data-cy usage 2025-01-29 08:31:40 +01:00
Javi Gallego 88e040411f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-29 07:49:07 +01:00
PAU ROVIRA ROSALENY a013152a09 Merge branch 'dev' into 8423-e2eZoneWarehouse 2025-01-29 06:45:51 +00:00
Javi Gallego c30070f212 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-29 07:38:33 +01:00
Javi Gallego 36554f9f32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-29 07:35:08 +01:00
Javi Gallego 63fc09ad1c fix: update setupNodeEvents to use async/await for plugin import 2025-01-29 07:35:04 +01:00
Javier Segarra d749f52771 Merge branch 'dev' into 7134-supplierBalance 2025-01-28 22:43:22 +00:00
Javier Segarra 01c4553e5f Merge branch 'dev' into 7134-supplierBalance 2025-01-28 23:38:45 +01:00