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

9423 Commits

Author SHA1 Message Date
Jose Antonio Tubau cc07d42de8 Merge pull request 'fix: refs #8316 fix broken localizations for entry descriptor menu and items filter panel' (!1288) from 8316-fixEntryLocalizations into test 
Reviewed-on: verdnatura/salix-front#1288
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-28 07:51:23 +00:00
Jose Antonio Tubau f385dd4e83 Merge branch 'test' into 8316-fixEntryLocalizations 2025-01-28 07:50:15 +00:00
Javier Segarra 3a8c35521e Merge branch 'dev' into 7134-supplierBalance 2025-01-28 08:47:54 +01:00
Jon Elias 15487bfbf2 fix: item type translations 2025-01-28 08:42:31 +01:00
Alex Moreno 01e726c6f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-28 08:23:45 +01:00
Alex Moreno b26bdd861b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-28 08:23:44 +01:00
Jon Elias 511f7ea283 Merge pull request 'Fix_TicketSummary[Address]: Show new field' (!1282) from Fix-TicketSummaryAddress into dev 
Reviewed-on: verdnatura/salix-front#1282
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-28 07:18:53 +00:00
Jon Elias 4ecce6af0a Merge branch 'dev' into Fix-TicketSummaryAddress 2025-01-28 07:13:25 +00:00
Alex Moreno 0f1d13e961 fix: use rightMenu 2025-01-28 08:04:41 +01:00
Alex Moreno 5d6c14f4d7 fix(fixedPrice): hotFix subtoolbar 2025-01-28 08:01:01 +01:00
Jose Antonio Tubau f9c874df2c Merge branch 'test' into 8316-fixEntryLocalizations 2025-01-28 06:52:45 +00:00
PAU ROVIRA ROSALENY 2f19f093cb feat: #8258 added hover and description to uppercase button 2025-01-28 06:49:39 +00:00
Jose Antonio Tubau 6a17f87050 refactor: refs #8316 update Spanish translations for ItemsFilterPanel 2025-01-28 07:46:16 +01:00
Alex Moreno afee23b99d Merge pull request '8452-testToMaster' (!1292) from 8452-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1292
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-28 06:44:16 +00:00
Jon Elias 2f283d1a78 Merge branch 'dev' into Fix-TicketSummaryAddress 2025-01-28 06:28:55 +00:00
Alex Moreno a0a7ef6734 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8452-testToMaster 2025-01-28 07:17:43 +01:00
Alex Moreno 8b916016c6 Merge pull request 'warmifx: Customer_filters' (!1131) from warmifx_customer_filters into test 
Reviewed-on: verdnatura/salix-front#1131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-28 06:17:30 +00:00
Jose Antonio Tubau 9121929359 Merge branch 'test' into 8316-fixEntryLocalizations 2025-01-28 06:07:31 +00:00
Javier Segarra e923ebcc72 Merge branch 'test' into warmifx_customer_filters 2025-01-27 18:05:16 +00:00
Javi Gallego de6b4f1951 Merge pull request '8381-thermographTravel' (!1244) from 8381-thermographTravel into dev 
Reviewed-on: verdnatura/salix-front#1244
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 15:21:40 +00:00
Javi Gallego d64c9e2a34 Merge branch 'dev' into 8381-thermographTravel 2025-01-27 16:20:04 +01:00
Alex Moreno d3e6462aed build: refs #8452 add change log 2025-01-27 15:24:08 +01:00
Alex Moreno a5ea756bc2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-27 14:39:28 +01:00
Alex Moreno b0420ee2b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-27 14:37:57 +01:00
Javier Segarra ba3f6a79e6 style: customerList 2025-01-27 14:31:54 +01:00
Javier Segarra b266c44d34 fix: sage params 2025-01-27 14:30:59 +01:00
Javier Segarra 8cbb97af29 Merge branch 'test' into warmifx_customer_filters 2025-01-27 14:08:59 +01:00
Javier Segarra 0916afbe37 fix: changel i18n 2025-01-27 14:04:37 +01:00
Javier Segarra 9dd216269a fix: vnSelectWorker fix template 2025-01-27 14:03:38 +01:00
Javier Segarra d1ba6e580f fix: params 2025-01-27 13:52:44 +01:00
Javier Segarra 13cd59c6bb fix: socialName filter 2025-01-27 13:52:37 +01:00
Jon Elias 3aa8acf02a fix: refs #8409 deleted code due to merge 2025-01-27 13:26:08 +01:00
Jon Elias 0db556a97b fix: refs #8409 deleted code of merge 2025-01-27 13:21:38 +01:00
Jon Elias 8642089bc7 Merge branch 'dev' of https: refs #8409//gitea.verdnatura.es/verdnatura/salix-front into 8409-VnSelectSupplier 2025-01-27 13:21:27 +01:00
Robert Ferrús 73f421f19e Merge pull request 'feat: refs #8387 crudModel' (!1206) from 8387-itemTagCrudModelFront into dev 
Reviewed-on: verdnatura/salix-front#1206
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 11:38:12 +00:00
Robert Ferrús 2cc04da76c feat: refs #8387 refs#8387 change request 2025-01-27 12:27:58 +01:00
Robert Ferrús a5ea7ab104 Merge branch 'dev' into 8387-itemTagCrudModelFront 2025-01-27 10:26:39 +00:00
Carlos Satorres 23f889af07 Merge branch 'dev' of https: refs #7917//gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-27 11:18:42 +01:00
Robert Ferrús a34c6e1ecf Merge pull request '6822-createEntryTransferOption' (!1267) from 6822-createEntryTransferOption into dev 
Reviewed-on: verdnatura/salix-front#1267
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 10:08:34 +00:00
Robert Ferrús a251053a84 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-27 10:06:20 +00:00
Alex Moreno 24266b53d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-27 10:24:37 +01:00
Alex Moreno 6b87402a6a refactor: advancedMenu button inside searchbar 2025-01-27 10:24:35 +01:00
Jon Elias 5927a60de2 Merge pull request '#8450: Added new icon's version' (!1266) from 8450-AddIconsV1-76 into dev 
Reviewed-on: verdnatura/salix-front#1266
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 09:13:59 +00:00
Jon Elias b69f3a08be Merge branch 'dev' into 8450-AddIconsV1-76 2025-01-27 09:11:33 +00:00
Robert Ferrús 9472f13695 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-27 09:01:22 +00:00
Alex Moreno d292395bb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-27 10:00:17 +01:00
Jon Elias 9c50079bfc Merge pull request '#7317: Deleted warnings' (!1261) from 7317-SupplierWarnings into dev 
Reviewed-on: verdnatura/salix-front#1261
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 09:00:14 +00:00
Alex Moreno 02da97a8df fix(VnSection): destroy data when unmounted 2025-01-27 10:00:09 +01:00
Jon Elias 7121dc4e0d Merge branch 'dev' into 7317-SupplierWarnings 2025-01-27 08:56:33 +00:00
Jon Elias 2027c365fa Merge pull request '#8120: Compact summaryPopup' (!1200) from 8120-CompactSummaryPopup into dev 
Reviewed-on: verdnatura/salix-front#1200
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-27 08:54:07 +00:00