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

10731 Commits

Author SHA1 Message Date
Jorge Penadés e9c0d6ae2d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8571-hotfix-notShowToken 2025-02-13 12:00:23 +01:00
Carlos Satorres da295685a3 fix: refs #8227 warmfix 2025-02-13 10:38:30 +01:00
Alex Moreno cd76e91980 feat: refs #6695 update cypress command in Jenkinsfile and docker-compose.e2e.yml 2025-02-13 10:24:25 +01:00
Pablo Natek 8411a2d779 Merge pull request 'fix: update user filter binding in ClaimLines' (!1384) from hotFixClaimLinesF5 into master 
Reviewed-on: verdnatura/salix-front#1384
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-13 09:20:27 +00:00
Alex Moreno e9389a00fd feat: refs #6695 update cypress command in Jenkinsfile and docker-compose.e2e.yml 2025-02-13 10:19:36 +01:00
Pablo Natek 7d55f42fac Merge branch 'master' into hotFixClaimLinesF5 2025-02-13 09:18:57 +00:00
Pablo Natek e8d03328cf fix: update user filter binding in ClaimLines 2025-02-13 10:16:36 +01:00
Alex Moreno 969570d099 feat: refs #6695 update cypress cache path command in Jenkinsfile 2025-02-13 10:10:11 +01:00
Alex Moreno 5375e98c91 feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml 2025-02-13 10:08:51 +01:00
Alex Moreno 8dba602771 feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml 2025-02-13 10:05:27 +01:00
Alex Moreno 3d8c397094 feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml 2025-02-13 10:03:22 +01:00
Alex Moreno 0a16b4cb52 feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml 2025-02-13 09:58:58 +01:00
Alex Moreno 8f9f1281f2 feat: refs #6695 install Cypress during Jenkins pipeline setup 2025-02-13 09:55:30 +01:00
Alex Moreno cbccf89b6f refactor: refs #6695 update Jenkinsfile to run E2E tests in parallel and simplify docker-compose command 2025-02-13 09:54:09 +01:00
Alex Moreno 5dc73614a3 refactor: refs #6695 update Jenkinsfile to run E2E tests in parallel and simplify docker-compose command 2025-02-13 09:48:11 +01:00
Alex Moreno 2e0b4a5322 feat: refs #6695 add cypress-cache volume to docker-compose.e2e.yml 2025-02-13 09:44:21 +01:00
Alex Moreno 56db3ffc51 feat: refs #6695 add cypress-cache volume to docker-compose.e2e.yml 2025-02-13 09:41:17 +01:00
Alex Moreno da77015ae8 refactor: refs #6695 improve parallel test execution logic in Jenkinsfile 2025-02-13 09:38:19 +01:00
Alex Moreno 872318a00c refactor: refs #6695 improve parallel test execution logic in Jenkinsfile 2025-02-13 09:38:09 +01:00
Alex Moreno 1faa5b74df fix: refs #6695 try 2025-02-13 09:35:49 +01:00
Alex Moreno 480ab7552e refactor: refs #6695 improve group size calculation for parallel test execution in Jenkinsfile 2025-02-13 09:31:26 +01:00
Alex Moreno c72e8d9fed refactor: refs #6695 improve group size calculation for parallel test execution in Jenkinsfile 2025-02-13 09:29:09 +01:00
Alex Moreno 8eb60e1700 refactor: refs #6695 update E2E test execution to support parallel groups and improve 2025-02-13 09:24:14 +01:00
Alex Moreno 4d0b03a480 refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile 2025-02-13 09:13:29 +01:00
Alex Moreno 211877fcc1 refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile 2025-02-13 09:12:10 +01:00
Alex Moreno 5f9b768d2d refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile 2025-02-13 09:10:18 +01:00
Alex Moreno 79e2a7ee25 refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile 2025-02-13 09:08:45 +01:00
Pablo Natek aad0e1f0ba Merge pull request 'feat: refs #6897 refactor VnColor and EntryList components; update FormModelPopup button visibility' (!1382) from 6897-minorChangesOnEntryBuys into dev 
Reviewed-on: verdnatura/salix-front#1382
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-13 08:03:44 +00:00
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