Commit Graph

18207 Commits

Author SHA1 Message Date
Javier Segarra 1810377738 Merge pull request '#2051 - DMS unify methods' (!1888) from 2051_dms_methods_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1888
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-18 07:14:35 +00:00
Javier Segarra 8d650cf6c0 refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 08:09:44 +01:00
Javier Segarra 1515b55f7d Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 12:06:07 +00:00
Javier Segarra 29a7d9b941 Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 13:01:47 +01:00
Javier Segarra dc98436b85 refs #2051 perf: rename variable 2023-12-15 13:01:44 +01:00
Javier Segarra c9af8cba81 refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 12:50:05 +01:00
Alex Moreno d47a4a7c16 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 11:12:47 +00:00
Guillermo Bonet e89ec55839 fix: refs #6172
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:09:07 +01:00
Carlos Satorres fe184156a1 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 13:51:09 +00:00
Carlos Satorres f73f3813b3 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-14 14:37:22 +01:00
Carlos Satorres bbb9f58a9e refs #6220 fix(client_filter): fix where 2023-12-14 14:37:14 +01:00
Javier Segarra 043c411f68 Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:11 +00:00
Javier Segarra 9316c31180 refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:36:36 +01:00
Javier Segarra 1939c65fab refs #6264 test: remove force describe for dms test 2023-12-14 12:35:54 +01:00
Javier Segarra d0af29c0c5 refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:28:41 +01:00
Javier Segarra d2461d67c9 refs #6264 test: perf renew-token.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:25:40 +01:00
Javier Segarra acf192f7e4 Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 12:21:12 +01:00
Javier Segarra 8d29850917 refs #6264 perf: remove UserError exception 2023-12-14 12:21:07 +01:00
Javier Segarra dddc749744 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 11:05:00 +00:00
Javier Segarra 61a323078b refs #6264 fix: remove DEFAULT_COURTESY_TIME
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 12:04:05 +01:00
Alex Moreno d7454cdb19 refs #6576 fix: correct version
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:59 +01:00
Alex Moreno e7911738c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 08:50:20 +01:00
Alex Moreno 157fe6f32f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 08:16:58 +01:00
Javier Segarra 397eb4d32b Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 06:22:22 +00:00
Javier Segarra 485968037b Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 06:22:17 +00:00
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
Robert Ferrús 4df2fa8ee4 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 13:30:53 +00:00
Robert Ferrús b9efbc7d44 refs #5854
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:30:29 +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
Javier Segarra 8a66391cd5 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 12:31:53 +00:00
Javier Segarra 11b54d66af refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued... Details
2023-12-13 13:31:32 +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
Javier Segarra 5a36fabf05 refs #6434 feat: insert record just when fail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 12:07:57 +01:00
Javier Segarra 6af99b7669 refs #6434 feat: delete records whe !owner 2023-12-13 12:07:41 +01: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
Javier Segarra 5f93b8c440 refs #6434 fix: bad merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 12:01:18 +01:00
Javier Segarra 5b3645a641 refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued... Details
2023-12-13 11:59:00 +01:00