Commit Graph

1076 Commits

Author SHA1 Message Date
Guillermo Bonet 9a82fbea05 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:07:32 +01:00
Guillermo Bonet d5ca47ea2a refactor: refs #6410 Deleted dmsType.path
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 09:51:12 +01:00
Alex Moreno 4e823593b5 refs #6067 fix(Mailer): await send email
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 14:35:01 +01:00
Javier Segarra 8ee6cfb015 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:36:35 +01:00
Javier Segarra 71937a4df3 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:17:16 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Jorge Penadés b086da1936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:57:46 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Javier Segarra 4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:26:18 +00:00
Jorge Penadés cd701ccd9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:42:06 +01:00
Alex Moreno 0101dcda3a refs #5925 fix: add options
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:12:45 +01:00
Alex Moreno 318761185b refs #6434 fix: remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:07:16 +01:00
Jorge Penadés 2e1715a968 refactor renewToken & replace ACL: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 15:19:45 +01:00
Javier Segarra 4d2cf87f49 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:37:53 +00:00
Javier Segarra 8d08adca21 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:36:02 +00:00
Javier Segarra ec1befcfb0 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:25:57 +00:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Alex Moreno 9951e911ae refs #5925 feat(docuware_upload): use userConfig.tabletFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 10:39:46 +01:00
Javier Segarra dc661f298b refs #6434 test: update tests
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 09:10:18 +00:00
Alex Moreno d30dcd7d70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet 2023-12-21 09:22:49 +01:00
Javier Segarra adc7608b25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:40:42 +01:00
Javier Segarra acb0ec508f refs #5499 feat: claimObservation 2023-12-20 12:09:01 +01:00
Javier Segarra cb35c36328 refs #6434 test: update tests
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 10:59:36 +00:00
Javier Segarra 57b3d96628 refs #6434 fix: bad throw error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 09:27:25 +00:00
Javier Segarra c3b91e1719 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 09:25:15 +00:00
Juan Ferrer 10bfafdd3c Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 09:05:53 +00:00
Javier Segarra 5151cdca48 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:06:36 +00: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 8d29850917 refs #6264 perf: remove UserError exception 2023-12-14 12:21:07 +01: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
Javier Segarra 7b9e3b0985 refs #2051 perf: removeFile after review 2023-12-13 14:24:05 +01:00
Javier Segarra bdf5dd6e3c refs #2051 feat: restore dms methods 2023-12-13 13:48:22 +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 11b54d66af refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued... Details
2023-12-13 13:31:32 +01: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
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
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
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
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
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
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 ae76776245 refs #2051 feat: removeFile approach 2023-12-12 12:09:06 +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 6ac5d28c40 refs #6085 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 09:59:09 +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
Javier Segarra b86c73777f Update back/tests.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 19:05:54 +00:00
Javier Segarra a7c48b6ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 13:02:34 +01:00
Javier Segarra 57add7abf0 refs #5666 perf: replace Role by VnRole 2023-12-05 07:16:12 +01:00
Javier Segarra 2fe631f078 refs #5666 feat: change models permissions 2023-12-05 07:15:22 +01:00
Javier Segarra a8b0a7a5b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 14:46:21 +01:00
Javier Segarra 5656ed7a2b refs #6264 perf: use functions extracted previously 2023-12-04 14:46:05 +01:00
Javier Segarra b9671c0b67 refs #6264 perf: remove files related to token 2023-12-04 14:44:50 +01:00
Carlos Satorres 051c93a42c remove fdescribe
gitea/salix/pipeline/head This commit looks good Details
2023-12-04 09:41:24 +01:00
Carlos Satorres c0ce7e542f refs #6085 solve testback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 09:40:57 +01:00
Carlos Satorres 6d486fbec9 refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:58:45 +01:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Javier Segarra 58855a7cdd refs #6434 perf: remove bad characters method description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 08:14:56 +01:00
Javier Segarra d4cd23853f refs #6264 perf: try to remove jasmine.clock()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 07:32:16 +01:00
Javier Segarra 9176cdb4cb refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:34:00 +00:00
Javier Segarra ed6c0924d7 refs #6434 perf: remove console.error
gitea/salix/pipeline/head Build queued... Details
2023-11-29 19:33:04 +00:00
Javier Segarra 48b82b02ca refs #6434 change param type for signInValidate
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:32:10 +00:00
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 13:22:17 +01:00
Javier Segarra bb9723b65d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:18:11 +01:00
Javier Segarra f5f2896cbf refs 5666 feat: replace Role model by VnRole model 2023-11-28 08:12:16 +01:00
Alex Moreno 7911cc12df Merge branch 'dev' into 6489-authSupport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 12:57:46 +00:00
Carlos Satorres a7361a89bd refs #6489 remove auth
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 12:58:07 +01:00
Javier Segarra 9da5fb9a14 refs #6264 other: rename camel-case variable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 10:24:25 +01:00
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Javier Segarra 81be3b18f7 refs #6264 test: validate-token and renew-token 2023-11-27 09:48:15 +01:00
Javier Segarra 72a0932e35 refs #6264 other: rename camel-case variable 2023-11-27 09:46:27 +01:00
Jorge Penadés 8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 10:53:38 +01:00
Jorge Penadés c56588a472 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:18:47 +01:00
Javi Gallego 4a62588464 Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-23 14:01:53 +00:00
Jorge Penadés 1f9030c36d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 13:35:46 +01:00
Jorge Penadés eeef279483 refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 13:34:29 +01:00
Alex Moreno 4735307f5d refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:49:00 +01:00
Jorge Penadés 900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:26:28 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Sergio De la torre 707173d618 refs #5890 fix: getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 07:04:33 +01:00
Jorge Penadés 3f8d1ff617 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:17:31 +01:00
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Alex Moreno 7951b874a6 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:39:50 +00:00
Alex Moreno aea3f7b2b9 refs #6434 fix: use trim
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 15:10:47 +01:00
Alex Moreno 83ae0379b5 refs #6434 fix: console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 12:28:35 +01:00
Javier Segarra abf772ae87 refs #6434 feat: check if signIn inserts signInLog
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:43:00 +01:00
Javier Segarra 386b556216 refs #6434 feat: new test user signIn with email
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:29:57 +01:00
Javier Segarra 579cd832c0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER 2023-11-16 10:08:06 +01:00
Alex Moreno 9c6b594426 hotFix: comment error logIn
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:04:34 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:29:53 +01:00
Alex Moreno 54e8e6a27d refs #6417 fix(vnUser): toLowerCase
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:10:45 +01:00
Javier Segarra 3c8ed3ff51 refs #6434 feat: username.toLowerCase() 2023-11-16 08:30:27 +01:00
Javier Segarra c6b5d7f5a4 refs #6434 feat: rename id key by token 2023-11-16 08:30:01 +01:00
Alex Moreno 5bdf6a7338 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 07:56:23 +01:00
Javier Segarra 58edcb9055 refs #6434 feat: save token in db for each login
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:06 +01:00
Javier Segarra 0a31968cc7 refs #6434 feat: show error for wrong login 2023-11-15 13:49:54 +01:00