Commit Graph

18164 Commits

Author SHA1 Message Date
Sergio De la torre 0130130cee Merge pull request '6275-silex-to-salix' (!1878) from 6275-silex-to-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1878
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-14 05:52:08 +00:00
Sergio De la torre af83519ee6 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:12:39 +00:00
Javier Segarra 1e89ed6cdc Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 14:39:10 +00:00
Javier Segarra 06bae44824 refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 15:38:46 +01:00
Carlos Satorres 9a5536a3a3 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:05:51 +00:00
Carlos Satorres cfa08963fb Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:05:43 +01:00
Carlos Satorres 40499e44cf refs #6220 remove concat 2023-12-13 15:05:41 +01:00
Javier Segarra 7b9e3b0985 refs #2051 perf: removeFile after review 2023-12-13 14:24:05 +01:00
Javier Segarra 7bdb1b2078 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor 2023-12-13 13:49:38 +01:00
Javier Segarra bdf5dd6e3c refs #2051 feat: restore dms methods 2023-12-13 13:48:22 +01:00
Javier Segarra a5ecec9603 refs #2051 feat: remove front methods refactor 2023-12-13 13:47:30 +01:00
Javier Segarra d364a50ec4 refs #6264 feat: remove validateToken endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 13:39:43 +01:00
David Domenech e7db97a671 Merge pull request 'refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit' (!1890) from 6125-roleCreditLimitFix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1890
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-13 11:46:39 +00:00
David Domenech 9bcd0a3c98 Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:29:46 +00:00
David Domenech fb74ea3b2c Merge pull request 'refactor(ticketTracking.userFk): refs #6398 workerFk to userFk' (!1874) from 6398-ticketTracking-change-workerFk-to-userFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1874
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-12-13 11:20:22 +00:00
David Domenech d4fa1e9aca refs #6398
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 12:04:07 +01:00
Carlos Satorres 4e8bec5684 refs #5925 user error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 12:03:04 +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
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
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
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 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
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
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 9165995ee5 Merge branch 'dev' into 5971-addressInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:07:45 +00:00