Commit Graph

18423 Commits

Author SHA1 Message Date
Javier Segarra 5b3645a641 refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued... Details
2023-12-13 11:59:00 +01:00
Javier Segarra d69b59b63e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 11:54:28 +01:00
David Domenech 2f61b648f7 refs #6398
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 09:49:03 +01:00
David Domenech ee6ad55e66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 09:43:20 +01:00
Pablo Natek f63b26b71f Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:52:36 +00:00
Carlos Satorres 371a202230 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 07:51:23 +00:00
Pablo Natek 69dd34665f refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 08:50:17 +01:00
Carlos Satorres 2393625a48 refs #5925 Tablet
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:22:58 +01:00
Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 06:30:14 +00:00
Sergio De la torre 435819cf3c refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:24:13 +01:00
Javier Segarra d44cdcbd13 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 06:14:55 +00:00
Sergio De la torre 9e23f475cc Merge pull request '6028_routesByWorkerEmail' (!1880) from 6028_routesByWorkerEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1880
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-13 05:59:18 +00:00
Javier Segarra 8441877f36 refs #6264 perf: remove field's query
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 19:43:32 +01:00
Javier Segarra 0ae75d973f refs #6264 perf: remove async keyword 2023-12-12 19:42:46 +01:00
Robert Ferrús 9159fe4d4e Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 17:03:27 +00:00
Robert Ferrús 5f4adab017 refs #5854
gitea/salix/pipeline/head Build queued... Details
2023-12-12 18:03:09 +01:00
Sergio De la torre e22201c840 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 14:50:25 +00:00
Sergio De la torre c44dc90075 Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 14:47:11 +00:00
Javier Segarra d206c93305 refs #2051 feat: getAllowedContentTypes approach
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 15:03:00 +01:00
Carlos Satorres 412cac7e94 refs #5925 models table docuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 14:42:36 +01:00
Javier Segarra 6334431d2b refs #2051 feat: uploadFile approach 2023-12-12 14:00:35 +01:00
Javier Segarra 6b70f8b3eb refs #2051 feat: uploadFile approach 2023-12-12 13:49:14 +01:00
Carlos Satorres 16a76f0bbf Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 12:21:12 +00:00
Carlos Satorres 78aa25d74f refs #6220 fix testback
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 13:21:08 +01:00
Carlos Satorres 6cefc982e4 refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:14:41 +01:00
Alex Moreno ea39f8b3be remove duplicate
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 12:25:51 +01:00
Javier Segarra ae76776245 refs #2051 feat: removeFile approach 2023-12-12 12:09:06 +01:00
Carlos Satorres 977184f3e5 Merge pull request 'refs #5971 change sql address' (!1882) from 5971-addressInvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1882
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-12 10:41:57 +00:00
Carlos Satorres f796227120 Merge branch 'dev' into 5971-addressInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 10:36:59 +00:00
Sergio De la torre 57739f4ed4 Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 09:52:58 +00:00
Robert Ferrús 9894591aa9 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 17:56:40 +00:00
Carlos Satorres 7e6f311a43 refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:51:11 +01:00
Carlos Satorres 2def2d9ebd Merge branch 'dev' into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 13:50:11 +00:00
Carlos Satorres c81ca94d2e refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:44:33 +01:00
Jorge Penadés 84270587cb refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:42:19 +01:00
Javier Segarra f817551a57 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:59:02 +01:00
Jorge Penadés 5f6f13e234 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:48:12 +01:00
Javier Segarra 24c7271dd8 Merge pull request '#6487 - Stop test container when finish' (!1884) from 6487_stop_test_container into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1884
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-12-11 11:47:34 +00:00
Carlos Satorres 2beb1f65f0 refs #6085 findOne
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:45:55 +01:00
Javier Segarra d1f0557923 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:40:16 +01:00
Javier Segarra 10247c744f Merge branch 'dev' into 6487_stop_test_container
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 11:37:15 +00:00
Guillermo Bonet a36f22a414 Merge pull request 'refs #6172 Change' (!1735) from 6172-errorMsg into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1735
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-12-11 10:48:58 +00:00
Guillermo Bonet 95a8646d07 Merge branch 'dev' into 6172-errorMsg
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:27:14 +00:00
Guillermo Bonet 09ad31a92d feat: refs #6172 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:58:48 +01:00
Carlos Satorres 53ff8784ff refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:16:46 +01:00
Carlos Satorres 6ac5d28c40 refs #6085 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 09:59:09 +01:00
Carlos Satorres 57ed36cdfc ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 09:43:38 +01:00
Carlos Satorres 1b78c6dfa7 Merge branch '6085-ACLsMail' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 08:55:01 +01:00
Carlos Satorres 584f3264ed refs #6085 refactor sql trad 2023-12-11 08:54:58 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00