verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 84 Releases Wiki Activity

Merge branch '7358-AddChipInNavbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Jon Elias 2025-03-21 13:26:01 +01:00
parent d8b9f3467a 8f9863ce9c
commit 373d011017
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -126,7 +126,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh 'sh test/cypress/cypressParallel.sh 2' sh 'sh test/cypress/cypressParallel.sh 1'
} }
} }
} }

6
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -190,9 +190,3 @@ const handlePhotoUpdated = (evt = false) => {
white-space: nowrap; white-space: nowrap;
} }
</style> </style>
<i18n>
es:
Click to allow the user to be disabled: Marcar para deshabilitar
Click to exclude the user from getting disabled: Marcar para no deshabilitar
</i18n>

5
src/pages/Worker/Card/WorkerDescriptorMenu.vue
View File

@ -63,3 +63,8 @@ const showChangePasswordDialog = () => {
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>
<i18n>
es:
Click to allow the user to be disabled: Marcar para deshabilitar
Click to exclude the user from getting disabled: Marcar para no deshabilitar
</i18n>