Commit Graph

18582 Commits

Author SHA1 Message Date
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
Carlos Satorres 04780e211d refs #5334 test front & 1/2 back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 16:03:55 +02:00
Vicent Llopis d727ea83ab refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:31:16 +02:00
Alex Moreno 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:29:46 +02:00
Vicent Llopis 0d85069e0f refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 15:01:38 +02:00
Alex Moreno a26ab80e88 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 13:00:55 +00:00
Carlos Satorres bb5247c49b refs #5334 tree
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:50 +02:00
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:23 +02:00
Alex Moreno 8d0ae30610 Merge pull request 'fix(workerLog): acl to hr' (!1584) from fix_workerLog_acl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1584
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-06-01 11:32:33 +00:00
Alex Moreno 69bf26433d fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 13:19:34 +02:00
Carlos Satorres f37c66304f refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 12:00:15 +02:00
Carlos Satorres 4c7c7f5c96 refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 11:30:28 +02:00
Carlos Satorres ffba5b2d7e Merge pull request 'refs #5398 fix' (!1579) from 5398-fixAgenciesWarehouses into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1579
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-06-01 07:49:38 +00:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Alex Moreno fb330cdbfa Merge pull request '232201_test_to_master' (!1582) from 232201_test_to_master into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1582
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-06-01 06:16:44 +00:00
Carlos Satorres 0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:52:21 +02:00
Alex Moreno de91e016e9 update changelLg
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:22:09 +02:00
Alex Moreno d02ee2fd12 deploy(232201)
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:16:06 +02:00
Alex Moreno 4f3b6c3035 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 15:00:33 +02:00
Alex Moreno 0263d76021 refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:58:16 +02:00
Vicent Llopis d5aae8f824 refs #5688 refactor: muestra un mensaje de error controlado
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:53:31 +02:00
Carlos Satorres 967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:46:19 +02:00
Alex Moreno 23c52cc9b5 Merge pull request '5752-master_to_test' (!1578) from 5752-master_to_test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1578
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-31 12:35:10 +00:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:10:25 +02:00
Vicent Llopis 3b4626ee74 a
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:01:16 +02:00
Carlos Satorres eb6953a2b6 refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:50:02 +02:00
Vicent Llopis 02665ec8e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-05-31 12:28:13 +02:00
Carlos Satorres d1a61b3e0d refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:26:49 +02:00
Carlos Satorres 489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-31 12:04:26 +02:00
Carlos Satorres e38bf4f1b3 refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:02:22 +02:00