Commit Graph

17068 Commits

Author SHA1 Message Date
Carlos Satorres 4ae6b7c739 Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-06 11:13:52 +00:00
Vicent Llopis b144948dcf conflictos resueltos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 12:31:44 +02:00
Vicent Llopis 98af8ee10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token 2023-06-06 12:31:20 +02:00
Vicent Llopis 391dba6d2c refs #5561 feat: add async functions
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 12:15:39 +02:00
Juan Ferrer 47fe77efde Merge pull request 'master' (!1592) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1592
2023-06-06 10:09:53 +00:00
Vicent Llopis 024cb1e3f4 refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:56:14 +02:00
Carlos Satorres ab66ffa64a Merge branch 'master' into hotfixTicketColors
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 09:47:24 +00:00
Carlos Satorres 05111c9268 hotfix test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:43:14 +02:00
Carlos Satorres 6f3704c365 hotfix colors ticket advance ticket future 2023-06-06 11:42:35 +02:00
Juan Ferrer 6ef7055bc9 refs #5563 Display show values in logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:05:04 +02:00
Alexandre Riera a477bb32ad Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1504) from 5513-backs-embalajes into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1504
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-06-06 06:21:09 +00:00
Alexandre Riera 36b0216640 refs #5513 changed tests description
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 07:40:38 +02:00
Alex Moreno 5d6eaca6b8 refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 15:20:07 +02:00
Alexandre Riera 9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 12:25:50 +00:00
Alex Moreno 64abf4bf14 refs #5472 fix req.data.error.code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 13:21:52 +02:00
Carlos Satorres d6cde764d7 refs #5334 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 10:38:08 +02:00
Vicent Llopis 5eac9d20dc a
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:43:39 +02:00
Vicent Llopis b253ea8edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:40:23 +02:00
Alexandre Riera 15b5f10a93 refs #5513 addFromBuy back added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 09:10:19 +02:00
Carlos Satorres 8afd149954 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:06:45 +02:00
Carlos Satorres 2545a40087 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 07:00:27 +00:00
Juan Ferrer fe32a2af05 refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:35:07 +02:00
Carlos Satorres d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-05 08:30:12 +02:00
Carlos Satorres c1cda1a3ff refs #5334 basicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:29:56 +02:00
Alex Moreno 91b0e3013a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:11:47 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Carlos Satorres 9ef51f5600 remove fdescribe puppeter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 07:55:53 +02:00
Carlos Satorres 5798b28c5e refs #5334 baicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 07:51:15 +02:00
Juan Ferrer 47c6ad6a71 refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:48:27 +02:00
Juan Ferrer 45eba4533a refs #5667 VnUser translation added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:47:45 +02:00
Juan Ferrer 5be79bbdef refs #5667 VnUser translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:31:36 +02:00
Alex Moreno 86cd5f5237 refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-02 15:07:02 +02:00
Carlos Satorres 1095a59954 refs #5334 rest back, e2e summary, less e2e basic
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 14:44:56 +02:00
Juan Ferrer 35cf48314a refs #4090 back memory limit increased because of pupeteer
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 13:51:26 +02:00
Vicent Llopis 67413360c6 refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 13:31:41 +02:00
Vicent Llopis 1408e5f5ad Merge pull request 'hotfix_sendMail' (!1587) from hotfix_sendMail into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1587
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-06-02 10:39:17 +00:00
Vicent Llopis 01175a4c6c quitado vn
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:32:34 +02:00
Vicent Llopis 186ec2ea41 fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:22:27 +02:00
Vicent Llopis ba64dbbe46 refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:20:29 +02:00
Juan Ferrer c05d6bb9a1 refs #5563 WorkerDocument translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 11:43:44 +02:00
Vicent Llopis ccc386454c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 11:11:09 +02:00
Vicent Llopis 02d2afcb8b refs #5561 feat: permite coloear todos los circulos
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 10:57:28 +02:00
Alexandre Riera 37bbc66ca4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 09:39:46 +02:00
Juan Ferrer 95715763a1 refs #5667 Worker translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:57:22 +02:00
Alex Moreno df21ca2d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-02 08:54:51 +02:00
Guillermo Bonet 20e574aef4 Merge pull request 'refs #5684 edi/updateData fix' (!1585) from 5684-ediUpdateData into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1585
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-02 06:29:50 +00:00
Vicent Llopis cf2bf0a17b refs #5561 delete: codigo obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:23:44 +02:00
Carlos Satorres 5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-02 08:21:14 +02:00
Alex Moreno cefe8e3e17 Merge pull request 'REFACTOR(node_version)! update to v20' (!1553) from salix-node20 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1553
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-02 06:14:01 +00:00
Guillermo Bonet 5b0a1d10bb refs #5684 edi/updateData fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 07:51:01 +02:00