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

10334 Commits

Author SHA1 Message Date
Pablo Natek 03c758dfa9 Merge branch 'dev' into 6897-minorChangesOnEntryBuys 2025-02-13 08:02:20 +00:00
Javi Gallego a6a0c134da feat: add 'visible' column to ItemShelving and fix totalLabels calculation 2025-02-13 09:01:50 +01:00
Pablo Natek de79da779f Merge branch 'dev' into 6897-minorChangesOnEntryBuys 2025-02-13 08:00:12 +00:00
Pablo Natek 8539e93389 feat: refs #6897 update FormModelPopup button logic and add entryList tests 2025-02-13 08:42:13 +01:00
Alex Moreno 9ffafa7514 Merge branch 'dev' into 8372-fixDoubleRequest 2025-02-13 06:30:51 +00:00
Pablo Natek 65e48f6194 feat: refs #6897 refactor VnColor and EntryList components; update FormModelPopup button visibility 2025-02-12 19:43:45 +01:00
Javier Segarra 614b953d63 Merge pull request 'fix: updates vntable2' (!1381) from fix_ticketNegatives into dev 
Reviewed-on: verdnatura/salix-front#1381
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-12 15:40:05 +00:00
Jon Elias 23e029b225 Merge branch 'dev' into fix_ticketNegatives 2025-02-12 15:30:07 +00:00
Javier Segarra a0dbb63346 fix: updates vntable2 2025-02-12 16:24:34 +01:00
Jorge Penadés e070245d3e fix: refs #8571 remove Authorization header from config and adjust confirmation modal logic 2025-02-12 14:15:52 +01:00
Jon Elias 273cae5df8 Merge pull request '#7451: Deleted module property in CardSummary and each module' (!1378) from 7451-DeleteModuleProp into dev 
Reviewed-on: verdnatura/salix-front#1378
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-12 12:11:18 +00:00
Jon Elias 8eb875b5b8 Merge branch 'dev' into 7451-DeleteModuleProp 2025-02-12 09:46:30 +00:00
Jorge Penadés 3fc076b006 fix: refs #8372 update routeList.spec.js to correct input values for route creation and selection 2025-02-12 10:37:40 +01:00
Jorge Penadés aee9be59aa fix: refs #8372 update routeList.spec.js to improve search functionality and clean up commented code 2025-02-12 10:36:38 +01:00
Jorge Penadés 1f89233372 refactor: refs #8372 simplify button click handlers in FormModelPopup.vue 2025-02-12 10:34:02 +01:00
Jorge Penadés cc2d1ed09d fix: refs #8372 correct comment syntax in routeList.spec.js 2025-02-12 10:17:06 +01:00
Jorge Penadés 5f12532983 Merge branch 'dev' of https: refs #8372//gitea.verdnatura.es/verdnatura/salix-front into 8372-fixDoubleRequest 2025-02-12 10:12:00 +01:00
PAU ROVIRA ROSALENY 4950ca6822 Merge pull request 'fix: #7065 fixed test intermittent error' (!1337) from 7065-testUserPanel into dev 
Reviewed-on: verdnatura/salix-front#1337
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-12 07:43:09 +00:00
PAU ROVIRA ROSALENY fa4802cd6d Merge branch 'dev' into 7065-testUserPanel 2025-02-12 07:41:55 +00:00
Jon Elias c941b99ea3 Merge pull request 'Hotfix[OrderCatalogItemDialog]: Fixed addToOrder functionality' (!1363) from hotfix-AddItemToOrder into master 
Reviewed-on: verdnatura/salix-front#1363
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-12 07:33:41 +00:00
Jon Elias 61199d456e Merge branch 'master' into hotfix-AddItemToOrder 2025-02-12 07:32:31 +00:00
Alex Moreno ef2e3c5351 refactor: remove unused defineEmits import in ChangeQuantityDialog.vue 2025-02-12 07:56:09 +01:00
Alex Moreno 224d554a37 fix: update import path for ParkingDescriptor in ParkingCard.vue 2025-02-12 07:54:28 +01:00
Pablo Natek b221e56aae Merge pull request '6897-refactorVnTableAndEntryBuys' (!1374) from 6897-refactorVnTableAndEntryBuys into dev 
Reviewed-on: verdnatura/salix-front#1374
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-12 06:49:36 +00:00
Alex Moreno 96d1f76bf2 Merge branch 'dev' into 7065-testUserPanel 2025-02-12 06:41:22 +00:00
Pablo Natek cce9016e4e Merge branch 'dev' into 6897-refactorVnTableAndEntryBuys 2025-02-11 15:50:51 +00:00
Jon Elias 701cb875d3 refactor: refs #7451 deleted module prop in CardSummary and modules 2025-02-11 16:44:55 +01:00
Pablo Natek 7e993cab73 refactor: refs #6897 improve condition checks in VnTable and remove unused emit in VnInputTime for cleaner code 2025-02-11 16:44:05 +01:00
Carlos Satorres 7b34433898 Merge pull request '7550-refactPagesParking' (!1350) from 7550-refactPagesParking into dev 
Reviewed-on: verdnatura/salix-front#1350
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-11 15:28:05 +00:00
Carlos Satorres a0b7f0083d Merge branch 'dev' into 7550-refactPagesParking 2025-02-11 15:26:23 +00:00
Carlos Satorres 5ae54e8aef Merge pull request 'fix: refs #8551 department summary' (!1360) from 8551-departmentSummary into master 
Reviewed-on: verdnatura/salix-front#1360
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-11 15:19:55 +00:00
Carlos Satorres ba178291fa Merge branch 'master' into 8551-departmentSummary 2025-02-11 15:14:32 +00:00
Pablo Natek b403daff0e refactor: refs #6897 update VnFilter and VnTable components to enhance customization and improve styling 2025-02-11 14:34:15 +01:00
Jorge Penadés 506b77766d Merge pull request 'fix: refs #8554 update password handling based on user identity' (!1375) from 8554-hotfix-wrongEndPoint into master 
Reviewed-on: verdnatura/salix-front#1375
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-02-11 13:04:12 +00:00
Jorge Penadés 61fc973951 fix: refs #8554 update password handling based on user identity 2025-02-11 12:40:16 +01:00
Pablo Natek 5605654bb8 refactor: refs #6897 remove unused import statements in VnFilter component for cleaner code 2025-02-11 12:30:35 +01:00
Pablo Natek 61ee7ced54 refactor: refs #6897 update component imports and class names for consistency and clarity 2025-02-11 12:25:42 +01:00
PAU ROVIRA ROSALENY bd7672c1ca Merge branch 'dev' into 7065-testUserPanel 2025-02-11 11:24:35 +00:00
Pablo Natek 9c306e4420 Merge branch '6897-entryBuyListRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor 2025-02-11 12:24:17 +01:00
Pablo Natek 7b2240b01d Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor 2025-02-11 12:24:15 +01:00
Alex Moreno fcf6957b74 refactor: refs #6897 update deletion handling in CrudModel component to improve data management 2025-02-11 11:35:34 +01:00
Alex Moreno c04adf0e7d refactor: refs #6897 update SkeletonDescriptor component add image 2025-02-11 11:15:19 +01:00
Alex Moreno 06a07d4fd3 refactor: refs #6897 update checkbox attributes to include toggleIndeterminate in EntryBuys component 2025-02-11 10:11:26 +01:00
Javier Segarra 4a2074dc9d Merge pull request '6321_negative_tickets' (!1371) from 6321_negative_tickets into dev 
Reviewed-on: verdnatura/salix-front#1371
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-11 09:04:30 +00:00
Javier Segarra 3a95e22f67 Merge branch 'dev' into 6321_negative_tickets 2025-02-11 08:51:33 +00:00
Jose Antonio Tubau 54585691c3 Merge pull request '#7411 - addInfoOnVnCheckboxAndVnInput' (!1295) from 7411-addInfoOnVnCheckboxAndVnInput into dev 
Reviewed-on: verdnatura/salix-front#1295
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-11 08:50:09 +00:00
Javier Segarra 4bd9e69bf1 Merge branch 'dev' into 6321_negative_tickets 2025-02-11 08:43:22 +00:00
Alex Moreno c975943eb1 Merge branch 'dev' into 7411-addInfoOnVnCheckboxAndVnInput 2025-02-11 08:38:51 +00:00
Jorge Penadés 115b60751a chore: refs #8372 remove unnecessary param 2025-02-11 09:31:03 +01:00
Jorge Penadés 012acb76b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8372-fixDoubleRequest 2025-02-11 09:29:53 +01:00