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

10035 Commits

Author SHA1 Message Date
Alex Moreno 6d7199b2ff fix: refs #6695 try parallel 2025-02-10 13:10:12 +01:00
Alex Moreno 2fcc7c94b8 fix: refs #6695 try parallel 2025-02-10 13:05:52 +01:00
Alex Moreno a31d6cf819 fix: refs #6695 fix e2e's 2025-02-10 12:43:34 +01:00
Alex Moreno 69fb218b21 fix: refs #6695 fix e2e's 2025-02-10 12:41:42 +01:00
Alex Moreno 93197b7bd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-docker_push 2025-02-10 12:05:09 +01:00
Alex Moreno 257edbbd13 fix: refs #6695 fix e2e's 2025-02-10 10:57:04 +01:00
Alex Moreno b8b7af6907 fix: refs #6695 e2e stockBought 2025-02-10 10:40:21 +01:00
Alex Moreno 6fe67e847b fix: refs #6695 e2e stockBought 2025-02-10 10:33:02 +01:00
Alex Moreno 95a8c0c3d0 fix: refs #6695 e2e stockBought 2025-02-10 10:29:23 +01:00
Alex Moreno 0a40dd598e fix: cardDescriptor use userFilter 2025-02-10 10:21:38 +01:00
Alex Moreno cf851c3cb2 test: refs #6695 e2e fix connection db 2025-02-10 09:50:41 +01:00
Alex Moreno 73cd08ebc3 test: refs #6695 e2e fix connection db 2025-02-10 09:31:13 +01:00
Alex Moreno 5bcda5324e test: refs #6695 e2e get logs 2025-02-10 09:24:00 +01:00
Alex Moreno 1beab6810e test: refs #6695 e2e get logs 2025-02-10 09:19:18 +01:00
Jon Elias 0e1f04323c Merge pull request 'Fix[OrderCatalogItemDialog]: Fixed add item to order' (!1359) from Fix-OrderCatalogAddToOrder into dev 
Reviewed-on: verdnatura/salix-front#1359
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-10 08:08:59 +00:00
Alex Moreno 6b87d2f816 test: refs #6695 e2e fix allowedHosts 2025-02-10 09:06:18 +01:00
Jon Elias 585bb9973e Merge branch 'dev' into Fix-OrderCatalogAddToOrder 2025-02-10 07:57:03 +00:00
Jon Elias 311eab363a Merge pull request '#8246 modified addressFk field to use dashIfEmpty filter' (!1208) from 8246-ZoneAddressFk2 into dev 
Reviewed-on: verdnatura/salix-front#1208
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-10 07:55:54 +00:00
Jon Elias a287844860 Merge branch 'dev' into 8246-ZoneAddressFk2 2025-02-10 07:54:53 +00:00
Jon Elias 73dfce4104 fix: fixed OrderCatalog add item to order 2025-02-10 08:51:51 +01:00
Alex Moreno 634d07ab46 test: refs #6695 e2e fix command 2025-02-10 08:38:12 +01:00
Alex Moreno a7a97fd205 test: refs #6695 e2e fix command 2025-02-10 08:23:57 +01:00
Jose Antonio Tubau b2f011e7cc Merge pull request 'fix: refs #7318 fixed claim summary warnings' (!1347) from 7318-claimSummaryFixWarnings into dev 
Reviewed-on: verdnatura/salix-front#1347
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-10 07:17:48 +00:00
Alex Moreno 6568e2525c test: refs #6695 e2e fix command 2025-02-10 08:17:48 +01:00
Jose Antonio Tubau b95d8f3b44 Merge branch 'dev' into 7318-claimSummaryFixWarnings 2025-02-10 07:16:40 +00:00
Alex Moreno 248edf9d88 test: refs #6695 e2e fix base urls 2025-02-10 08:16:05 +01:00
Alex Moreno 4b78d9f9ec test: refs #6695 e2e fix back image 2025-02-10 08:05:17 +01:00
Alex Moreno bdc175aa9d test: refs #6695 e2e fix back image 2025-02-10 08:02:05 +01:00
Alex Moreno f5758d0fe9 test: refs #6695 e2e fix back image 2025-02-10 08:00:02 +01:00
Alex Moreno 1507febd91 test: refs #6695 e2e fix sequential 2025-02-10 07:57:57 +01:00
Alex Moreno 062389626e test: refs #6695 e2e fix network 2025-02-10 07:54:51 +01:00
Alex Moreno 30b0630c88 test: refs #6695 e2e fix network 2025-02-10 07:50:06 +01:00
Alex Moreno 884ad672b1 feat: refs #6695 add setup and e2e testing 2025-02-10 07:44:52 +01:00
Jorge Penadés dc3c800342 Merge pull request 'fix: refs #6919 include entityId in descriptor filter' (!1358) from 6919-fixFilters into dev 
Reviewed-on: verdnatura/salix-front#1358
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-09 12:24:03 +00:00
Jorge Penadés 1948ee9c52 fix: refs #6919 include entityId in descriptor filter 2025-02-09 10:16:48 +01:00
Carlos Satorres f8b41101d3 Merge pull request 'fix: improve method into dev' (!1356) from fix_reload_icon into dev 
Reviewed-on: verdnatura/salix-front#1356
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-07 14:19:32 +00:00
Javier Segarra d060e88ebb fix: improve method into dev 
Reviewed-on: verdnatura/salix-front#1354
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-07 14:15:28 +00:00
Jorge Penadés b75578b6fb Merge pull request '#8388 fixInvoiceIn' (!1321) from 8388-fixInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1321
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 13:51:46 +00:00
Jorge Penadés 8380808ffa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-02-07 14:49:43 +01:00
Jon Elias b1f0cc7f1d Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!1351) from Fix-ItemFixedPriceNameFilter into dev 
Reviewed-on: verdnatura/salix-front#1351
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 12:44:37 +00:00
Jon Elias 94849d0cdf Merge branch 'dev' into Fix-ItemFixedPriceNameFilter 2025-02-07 12:43:23 +00:00
Jon Elias 0692de7bfb fix: fixed item name filter 2025-02-07 13:41:34 +01:00
Alex Moreno 2d65811360 Merge branch 'dev' into 8246-ZoneAddressFk2 2025-02-07 12:04:55 +00:00
Jorge Penadés f01e5b824e fix: refs #8388 adjust table cell properties and remove unused styles in InvoiceInVat.vue 2025-02-07 10:41:42 +01:00
Jorge Penadés d9897b3ea2 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-02-07 10:05:30 +01:00
Jorge Penadés de6020626f Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev 
Reviewed-on: verdnatura/salix-front#1346
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 09:03:52 +00:00
Jorge Penadés 05f6e1ec20 Merge branch '7119-showCountryName' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName 2025-02-07 10:02:46 +01:00
Jorge Penadés 0adb86d4f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName 2025-02-07 10:02:37 +01:00
Javier Segarra 86b77c2022 Merge pull request '#7601 - Different agency fot future tickets' (!1342) from 7601_futureAgency into dev 
Reviewed-on: verdnatura/salix-front#1342
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-07 08:36:18 +00:00
Javier Segarra 0901c57b12 Merge branch 'dev' into 7601_futureAgency 2025-02-07 08:32:53 +00:00